Conflicts:
arch/xtensa/Kconfig
drivers/leds/leds-s3c24xx.c
18 files changed:
config VARIANT_IRQ_SWITCH
def_bool n
+config MAY_HAVE_SMP
+ def_bool n
+
+ config HAVE_XTENSA_GPIO32
+ def_bool n
+
menu "Processor type and features"
choice
#include <linux/gpio.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/platform_data/leds-s3c24xx.h>
-#include <mach/hardware.h>
#include <mach/regs-gpio.h>
-#include <linux/platform_data/leds-s3c24xx.h>
+ #include <plat/gpio-cfg.h>
/* our context */