linux-next: manual merge of the gpio tree with the leds tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/leds/leds-s3c24xx.c between commit cfc7937fb6bd ("leds: s3c24xx:
Remove hardware.h inclusion") from the leds tree and commit 224feb33a645
("leds: s3c24xx: Fix build failure") from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/leds/leds-s3c24xx.c
index b7876eb09e8c,87cf215af798..000000000000
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@@ -18,9 -18,11 +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 <plat/gpio-cfg.h>
 -#include <linux/platform_data/leds-s3c24xx.h>
  
  /* our context */

Attachment: pgp00000.pgp
Description: PGP signature