Merge tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

Merge Kconfig cleanups from Rob Herring:

Several mach kconfig clean-ups of redundant selects

* tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  ARM: qcom: clean-up unneeded kconfig selects
  ARM: bcm: clean-up unneeded kconfig selects
  ARM: mvebu: clean-up unneeded kconfig selects
  + Linux 3.15-rc2

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-versatile/core.c
index b31878570a000b0e4156853b6c2a68b63a37bf57,f2c89fb8fca9d6bf6d2324404b45fad1869288f8..be83ba25f81b7e75064befef4dd4b599d63d91e2
--- 1/arch/arm/mach-versatile/core.c
--- 2/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@@ -108,7 -108,7 +108,7 @@@ void __init versatile_init_irq(void
  
        np = of_find_matching_node_by_address(NULL, vic_of_match,
                                              VERSATILE_VIC_BASE);
-       __vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0, np);
+       __vic_init(VA_VIC_BASE, 0, IRQ_VIC_START, ~0, 0, np);
  
        writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
  
@@@ -310,21 -310,6 +310,21 @@@ static struct platform_device char_lcd_
        .resource       =       char_lcd_resources,
  };
  
 +static struct resource leds_resources[] = {
 +      {
 +              .start  = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET,
 +              .end    = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET + 4,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +};
 +
 +static struct platform_device leds_device = {
 +      .name           = "versatile-leds",
 +      .id             = -1,
 +      .num_resources  = ARRAY_SIZE(leds_resources),
 +      .resource       = leds_resources,
 +};
 +
  /*
   * Clock handling
   */
@@@ -810,7 -795,6 +810,7 @@@ void __init versatile_init(void
        platform_device_register(&versatile_i2c_device);
        platform_device_register(&smc91x_device);
        platform_device_register(&char_lcd_device);
 +      platform_device_register(&leds_device);
  
        for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                struct amba_device *d = amba_devs[i];

diff --combined drivers/leds/Kconfig
index 93235f7378ba630528abcd5f60ca90e30fabd6da,6de9dfbf61c197fe6078a633aabc47cd47805bcf..9adc79406ff39623093246bfc05edc36db2a6912
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -416,12 -416,12 +416,12 @@@ config LEDS_MC1378
        depends on MFD_MC13XXX
        help
          This option enable support for on-chip LED drivers found
-         on Freescale Semiconductor MC13783/MC13892 PMIC.
+         on Freescale Semiconductor MC13783/MC13892/MC34708 PMIC.
  
  config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"
        depends on LEDS_CLASS
-       depends on ARCH_KIRKWOOD
+       depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
        default y
        help
          This option enable support for the dual-GPIO LED found on the
@@@ -431,7 -431,7 +431,7 @@@
  config LEDS_NETXBIG
        tristate "LED support for Big Network series LEDs"
        depends on LEDS_CLASS
-       depends on ARCH_KIRKWOOD
+       depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
        default y
        help
          This option enable support for LEDs found on the LaCie 2Big
@@@ -474,7 -474,7 +474,7 @@@ config LEDS_LM355
  
  config LEDS_OT200
        tristate "LED support for the Bachmann OT200"
-       depends on LEDS_CLASS && HAS_IOMEM
+       depends on LEDS_CLASS && HAS_IOMEM && (X86_32 || COMPILE_TEST)
        help
          This option enables support for the LEDs on the Bachmann OT200.
          Say Y to enable LEDs on the Bachmann OT200.
@@@ -487,14 -487,6 +487,14 @@@ config LEDS_BLINK
          This option enables support for the BlinkM RGB LED connected
          through I2C. Say Y to enable support for the BlinkM LED.
  
 +config LEDS_VERSATILE
 +      bool "LED support for the ARM Versatile and RealView"
 +      depends on ARCH_REALVIEW || ARCH_VERSATILE
 +      depends on LEDS_CLASS
 +      help
 +        This option enabled support for the LEDs on the ARM Versatile
 +        and RealView boards. Say Y to enabled these.
 +
  comment "LED Triggers"
  source "drivers/leds/trigger/Kconfig"