softlockup: fix invalid proc_handler for softlockup_panic

[pandora-kernel.git] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 531156f..0f1863e 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY
 config PPC
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
 
@@ -371,22 +372,6 @@ config MPC8XXFADS
        bool "FADS"
        select FADS
 
-config MPC86XADS
-       bool "MPC86XADS"
-       help
-         MPC86x Application Development System by Freescale Semiconductor.
-         The MPC86xADS is meant to serve as a platform for s/w and h/w
-         development around the MPC86X processor families.
-       select FADS
-
-config MPC885ADS
-       bool "MPC885ADS"
-       help
-         Freescale Semiconductor MPC885 Application Development System (ADS).
-         Also known as DUET.
-         The MPC885ADS is meant to serve as a platform for s/w and h/w
-         development around the MPC885 processor family.
-
 config TQM823L
        bool "TQM823L"
        help
@@ -478,53 +463,6 @@ config WINCEPT
 
 endchoice
 
-menu "Freescale Ethernet driver platform-specific options"
-       depends on FS_ENET
-
-       config MPC8xx_SECOND_ETH
-       bool "Second Ethernet channel"
-       depends on (MPC885ADS || MPC86XADS)
-       default y
-       help
-         This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
-         The latter will use SCC1, for 885ADS you can select it below.
-
-       choice
-               prompt "Second Ethernet channel"
-               depends on MPC8xx_SECOND_ETH
-               default MPC8xx_SECOND_ETH_FEC2
-
-               config MPC8xx_SECOND_ETH_FEC2
-               bool "FEC2"
-               depends on MPC885ADS
-               help
-                 Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
-                 (often 2-nd UART) will not work if this is enabled.
-
-               config MPC8xx_SECOND_ETH_SCC1
-               bool "SCC1"
-               depends on MPC86XADS
-               select MPC8xx_SCC_ENET_FIXED
-               help
-                 Enable SCC1 to serve as 2-nd Ethernet channel. Note that SMC1
-                 (often 1-nd UART) will not work if this is enabled.
-
-               config MPC8xx_SECOND_ETH_SCC3
-               bool "SCC3"
-               depends on MPC885ADS
-               help
-                 Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
-                 (often 1-nd UART) will not work if this is enabled.
-
-       endchoice
-
-       config MPC8xx_SCC_ENET_FIXED
-       depends on MPC8xx_SECOND_ETH_SCC
-       default n
-       bool "Use fixed MII-less mode for SCC Ethernet"
-
-endmenu
-
 choice
        prompt "Machine Type"
        depends on 6xx
@@ -665,9 +603,6 @@ config TQM8260
          End of Life: not yet :-)
          URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf>
 
-config ADS8272
-       bool "ADS8272"
-
 config PQ2FADS
        bool "Freescale-PQ2FADS"
        help
@@ -697,11 +632,6 @@ config EV64360
          platform.
 endchoice
 
-config PQ2ADS
-       bool
-       depends on ADS8272
-       default y
-
 config TQM8xxL
        bool
        depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
@@ -724,15 +654,6 @@ config 8260
          this option means that you wish to build a kernel for a machine with
          an 8260 class CPU.
 
-config 8272
-       bool
-       depends on 6xx
-       default y if ADS8272
-       select 8260
-       help
-         The MPC8272 CPM has a different internal dpram setup than other CPM2
-         devices
-
 config CPM1
        bool
        depends on 8xx
@@ -1068,7 +989,7 @@ config PCI_8260
 
 config 8260_PCI9
        bool "Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260 && !ADS8272
+       depends on PCI_8260
        default y
 
 choice