summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-s3c24xx.c
diff options
context:
space:
mode:
authorChris Zankel2014-02-24 09:34:36 +0100
committerChris Zankel2014-02-24 09:34:36 +0100
commitb3fdfc1b4b641d372e35ced98814289bc60bc5d1 (patch)
tree5f11d5ba885031dde45690745646519fb887f447 /drivers/leds/leds-s3c24xx.c
parentxtensa: fix fast_syscall_spill_registers (diff)
parentxtensa: wire up sched_setattr and sched_getattr syscalls (diff)
downloadkernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.gz
kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.xz
kernel-qcow2-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.zip
Merge tag 'xtensa-for-next-20140221-1' into for_next
Xtensa fixes for 3.14: - allow booting xtfpga on boards with new uBoot and >128MBytes memory; - drop nonexistent GPIO32 support from fsf variant; - don't select USE_GENERIC_SMP_HELPERS; - enable common clock framework support, set up ethoc clock on xtfpga; - wire up sched_setattr and sched_getattr syscalls. Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'drivers/leds/leds-s3c24xx.c')
-rw-r--r--drivers/leds/leds-s3c24xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 76483fb5ee45..98174e7240ee 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -18,10 +18,10 @@
#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 */