diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 04:24:25 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 04:24:25 +0400 |
commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/platforms/44x/Kconfig | |
parent | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 (diff) | |
parent | 228d55053397e6d5325ca179c7ffe331de2846d3 (diff) | |
download | linux-1e7342e7789fa2ca9202701467428726cbcfd649.tar.xz |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/platforms/44x/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 762322ce24a9..5d5aaf6c91aa 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -186,6 +186,16 @@ config ISS4xx help This option enables support for the IBM ISS simulation environment +config CURRITUCK + bool "IBM Currituck (476fpe) Support" + depends on PPC_47x + default n + select SWIOTLB + select 476FPE + select PPC4xx_PCI_EXPRESS + help + This option enables support for the IBM Currituck (476fpe) evaluation board + config ICON bool "Icon" depends on 44x @@ -308,6 +318,10 @@ config 460SX select IBM_EMAC_ZMII select IBM_EMAC_TAH +config 476FPE + bool + select PPC_FPU + config APM821xx bool select PPC_FPU |