From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jan 2014 02:53:01 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney... 
X-Git-Tag: Ubuntu-5.2.0-15.16~14116
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=268943fb7529a15254a5247372119ba4bd735e94;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu:
 "Basically this cycle is mostly cleanup for LED subsystem"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: s3c24xx: Remove hardware.h inclusion
  leds: replace list_for_each with list_for_each_entry
  leds: kirkwood: Cleanup in header files
  leds: pwm: Remove a warning on non-DT platforms
  leds: leds-pwm: fix duty time overflow.
  leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock
  leds: leds-mc13783: Remove duplicate field in platform data
  drivers: leds: leds-tca6507: check CONFIG_GPIOLIB whether defined for 'gpio_base'
  leds: lp5523: Support LED MUX configuration on running a pattern
  leds: lp5521/5523: Fix multiple engine usage bug
  LEDS: tca6507 - fix up some comments.
  LEDS: tca6507: add device-tree support for GPIO configuration.
  LEDS: tca6507 - fix bugs in parsing of device-tree configuration.
---

268943fb7529a15254a5247372119ba4bd735e94
diff --cc drivers/leds/leds-s3c24xx.c
index 87cf215af798,b7876eb09e8c..98174e7240ee
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@@ -18,11 -18,9 +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 */