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.
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
/*
|
||||
* arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
|
||||
*
|
||||
* Platform data structure for netxbig LED driver
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
@@ -8,8 +6,8 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#ifndef __MACH_LEDS_NETXBIG_H
|
||||
#define __MACH_LEDS_NETXBIG_H
|
||||
#ifndef __LEDS_KIRKWOOD_NETXBIG_H
|
||||
#define __LEDS_KIRKWOOD_NETXBIG_H
|
||||
|
||||
struct netxbig_gpio_ext {
|
||||
unsigned *addr;
|
||||
@@ -52,4 +50,4 @@ struct netxbig_led_platform_data {
|
||||
int num_leds;
|
||||
};
|
||||
|
||||
#endif /* __MACH_LEDS_NETXBIG_H */
|
||||
#endif /* __LEDS_KIRKWOOD_NETXBIG_H */
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
/*
|
||||
* arch/arm/mach-kirkwood/include/mach/leds-ns2.h
|
||||
*
|
||||
* Platform data structure for Network Space v2 LED driver
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
@@ -8,8 +6,8 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#ifndef __MACH_LEDS_NS2_H
|
||||
#define __MACH_LEDS_NS2_H
|
||||
#ifndef __LEDS_KIRKWOOD_NS2_H
|
||||
#define __LEDS_KIRKWOOD_NS2_H
|
||||
|
||||
struct ns2_led {
|
||||
const char *name;
|
||||
@@ -23,4 +21,4 @@ struct ns2_led_platform_data {
|
||||
struct ns2_led *leds;
|
||||
};
|
||||
|
||||
#endif /* __MACH_LEDS_NS2_H */
|
||||
#endif /* __LEDS_KIRKWOOD_NS2_H */
|
||||
|
||||
Reference in New Issue
Block a user