diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-04 21:10:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-04 21:10:45 -0700 |
| commit | f375964d34f8f5447dbe7a3b72c071a1d3491bca (patch) | |
| tree | 484273a5fd370d46c30fc1cbcd1a76556c240c8f /arch/arm/mach-realview/realview_pbx.c | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| parent | 9b58d187fdce9df05fd331ad5790bf503d7e3dfe (diff) | |
| download | talos-op-linux-f375964d34f8f5447dbe7a3b72c071a1d3491bca.tar.gz talos-op-linux-f375964d34f8f5447dbe7a3b72c071a1d3491bca.zip | |
Merge tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "Versatile LEDs conversion" from Linus Walleij:
This contains a christmas-decoration fix from Russell
King, converts the Versatile LEDs to a platform device
and moves the driver to the LEDs subsystem.
* tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: plat-versatile: update defconfigs for Versatile LEDs
ARM/leds: move ARM Versatile LED driver to leds subsystem
ARM: plat-versatile: convert LEDs to platform device
ARM: plat-versatile: LEDs initialise to off state
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-realview/realview_pbx.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 9d75493e3f0c..72c96caebefa 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c @@ -385,6 +385,7 @@ static void __init realview_pbx_init(void) realview_eth_register(NULL, realview_pbx_smsc911x_resources); platform_device_register(&realview_i2c_device); platform_device_register(&realview_cf_device); + platform_device_register(&realview_leds_device); realview_usb_register(realview_pbx_isp1761_resources); for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
