Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: geode: New PCEngines Alix system driver

diff --combined arch/x86/Kconfig
index f497677,8c4e5bc..16db864
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -64,12 -64,10 +64,12 @@@ config X8
        select HAVE_TEXT_POKE_SMP
        select HAVE_GENERIC_HARDIRQS
        select HAVE_SPARSE_IRQ
 +      select SPARSE_IRQ
        select GENERIC_FIND_FIRST_BIT
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select GENERIC_IRQ_SHOW
 +      select GENERIC_CLOCKEVENTS_MIN_ADJUST
        select IRQ_FORCED_THREADING
        select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_BPF_JIT if (X86_64 && NET)
@@@ -132,7 -130,7 +132,7 @@@ config SBU
        bool
  
  config NEED_DMA_MAP_STATE
 -       def_bool (X86_64 || DMAR || DMA_API_DEBUG)
 +       def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)
  
  config NEED_SG_DMA_LENGTH
        def_bool y
@@@ -222,7 -220,7 +222,7 @@@ config ARCH_SUPPORTS_DEBUG_PAGEALLO
  
  config HAVE_INTEL_TXT
        def_bool y
 -      depends on EXPERIMENTAL && DMAR && ACPI
 +      depends on EXPERIMENTAL && INTEL_IOMMU && ACPI
  
  config X86_32_SMP
        def_bool y
@@@ -281,7 -279,7 +281,7 @@@ config SM
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
  
 -        See also <file:Documentation/i386/IO-APIC.txt>,
 +        See also <file:Documentation/x86/i386/IO-APIC.txt>,
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.tldp.org/docs.html#howto>.
  
@@@ -289,7 -287,7 +289,7 @@@
  
  config X86_X2APIC
        bool "Support x2apic"
 -      depends on X86_LOCAL_APIC && X86_64 && INTR_REMAP
 +      depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP
        ---help---
          This enables x2apic support on CPUs that have this feature.
  
@@@ -2066,6 -2064,20 +2066,20 @@@ config OLPC_XO15_SC
           - AC adapter status updates
           - Battery status updates
  
+ config ALIX
+       bool "PCEngines ALIX System Support (LED setup)"
+       select GPIOLIB
+       ---help---
+         This option enables system support for the PCEngines ALIX.
+         At present this just sets up LEDs for GPIO control on
+         ALIX2/3/6 boards.  However, other system specific setup should
+         get added here.
+ 
+         Note: You must still enable the drivers for GPIO and LED support
+         (GPIO_CS5535 & LEDS_GPIO) to actually use the LEDs
+ 
+         Note: You have to set alix.force=1 for boards with Award BIOS.
+ 
  endif # X86_32
  
  config AMD_NB

diff --combined drivers/leds/Kconfig
index 807c875,8974d27..dc7caad
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -113,14 -113,6 +113,6 @@@ config LEDS_WRA
        help
          This option enables support for the PCEngines WRAP programmable LEDs.
  
- config LEDS_ALIX2
-       tristate "LED Support for ALIX.2 and ALIX.3 series"
-       depends on LEDS_CLASS
-       depends on X86 && !GPIO_CS5535 && !CS5535_GPIO
-       help
-         This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
-         You have to set leds-alix2.force=1 for boards with Award BIOS.
- 
  config LEDS_COBALT_QUBE
        tristate "LED Support for the Cobalt Qube series front LED"
        depends on LEDS_CLASS
@@@ -400,7 -392,7 +392,7 @@@ config LEDS_TRIGGER_TIME
          This allows LEDs to be controlled by a programmable timer
          via sysfs. Some LED hardware can be programmed to start
          blinking the LED without any further software interaction.
 -        For more details read Documentation/leds-class.txt.
 +        For more details read Documentation/leds/leds-class.txt.
  
          If unsure, say Y.