9 files changed, 3 insertions, 80 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 44789eff983f..98975f58e19e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1133,10 +1133,9 @@ config IWMMXT
           Enable support for iWMMXt context switching at run time if
           running on a CPU that supports it.
 
-#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
         bool
-        depends on CPU_XSCALE && !XSCALE_PMU_TIMER
+        depends on CPU_XSCALE
         default y
 
 config CPU_HAS_PMU
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c
index 80538b8806ed..248804bb2c9d 100644
--- a/arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/arch/arm/mach-pxa/colibri-pxa270-income.c
@@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {}
 /******************************************************************************
  * Backlight
  ******************************************************************************/
-#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE)
+#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
 static struct platform_pwm_backlight_data income_backlight_data = {
         .pwm_id         = 0,
         .max_brightness = 0x3ff,
diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index 0b9a630dc812..14881e81e8a3 100644
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -1,6 +1,5 @@
 menu "Kernel hacking"
 
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 config PROFILING
         bool "Kernel profiling support"
 
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index bad27a6ff407..c5e69abb4889 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -341,16 +341,6 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-#config MATH_EMULATION
-#       bool "Math emulation support (EXPERIMENTAL)"
-#       depends on EXPERIMENTAL
-#       help
-#         At some point in the future, this will cause floating-point math
-#         instructions to be emulated by the kernel on machines that lack a
-#         floating-point math coprocessor.  Thrill-seekers and chronically
-#         sleep-deprived psychotic hacker types can say Y now, everyone else
-#         should probably wait a while.
-
 menu "Power management options"
 
 config ARCH_SUSPEND_POSSIBLE
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d46f1da18a3c..c72bf8dc9a61 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2369,10 +2369,6 @@ config TC
           Linux driver support status is documented at:
           <http://www.linux-mips.org/wiki/DECstation>
 
-#config ACCESSBUS
-#       bool "Access.Bus support"
-#       depends on TC
-
 config MMU
         bool
         default y
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig
index bc5e9769bb73..4b2ea282b9c7 100644
--- a/arch/mips/sgi-ip27/Kconfig
+++ b/arch/mips/sgi-ip27/Kconfig
@@ -1,9 +1,3 @@
-#config SGI_SN0_XXL
-#       bool "IP27 XXL"
-#       depends on SGI_IP27
-#         This options adds support for userspace processes up to 16TB size.
-#         Normally the limit is just .5TB.
-
 choice
         prompt "Node addressing mode"
         depends on SGI_IP27
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 153022971daa..bd69cf8d8222 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,19 +1,3 @@
-#config BUBINGA
-#       bool "Bubinga"
-#       depends on 40x
-#       default n
-#       select 405EP
-#       help
-#         This option enables support for the IBM 405EP evaluation board.
-
-#config CPCI405
-#       bool "CPCI405"
-#       depends on 40x
-#       default n
-#       select 405GP
-#       help
-#         This option enables support for the CPCI405 board.
-
 config ACADIA
         bool "Acadia"
         depends on 40x
@@ -65,14 +49,6 @@ config MAKALU
         help
           This option enables support for the AMCC PPC405EX board.
 
-#config SYCAMORE
-#       bool "Sycamore"
-#       depends on 40x
-#       default n
-#       select 405GPR
-#       help
-#         This option enables support for the IBM PPC405GPr evaluation board.
-
 config WALNUT
         bool "Walnut"
         depends on 40x
@@ -172,17 +148,3 @@ config IBM405_ERR77
 # All 40x-based cores, up until the 405GPR and 405EP have this errata.
 config IBM405_ERR51
         bool
-
-#config BIOS_FIXUP
-#       bool
-#       depends on BUBINGA || EP405 || SYCAMORE || WALNUT
-#       default y
-
-#config PPC4xx_DMA
-#       bool "PPC4xx DMA controller support"
-#       depends on 4xx
-
-#config PPC4xx_EDMA
-#       bool
-#       depends on !STB03xxx && PPC4xx_DMA
-#       default y
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 762322ce24a9..0cb8899a5cc1 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -75,7 +75,7 @@ config KATMAI
         select PCI
         select PPC4xx_PCI_EXPRESS
         select PCI_MSI
-        select PCC4xx_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -197,22 +197,6 @@ config ICON
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
-#config LUAN
-#       bool "Luan"
-#       depends on 44x
-#       default n
-#       select 440SP
-#       help
-#         This option enables support for the IBM PPC440SP evaluation board.
-
-#config OCOTEA
-#       bool "Ocotea"
-#       depends on 44x
-#       default n
-#       select 440GX
-#       help
-#         This option enables support for the IBM PPC440GX evaluation board.
-
 config XILINX_VIRTEX440_GENERIC_BOARD
         bool "Generic Xilinx Virtex 5 FXT board support"
         depends on 44x
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a9fbd43395f7..7014cfc66d2b 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -87,7 +87,6 @@ config S390
         select HAVE_KERNEL_LZMA
         select HAVE_KERNEL_LZO
         select HAVE_KERNEL_XZ
-        select HAVE_GET_USER_PAGES_FAST
         select HAVE_ARCH_MUTEX_CPU_RELAX
         select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
         select HAVE_RCU_TABLE_FREE if SMP