aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-10-31 01:08:14 -0400
committerPaul Mackerras <paulus@samba.org>2008-10-31 01:08:14 -0400
commit8694a1c6056f1f5f006a0442428f2df5171b9656 (patch)
tree56a855d616532ba23948e1257a0f8b1cf13347cc /arch/powerpc/platforms
parent43271c4128071c39ac8f7bfda4780c28b6401545 (diff)
parent8531b7a805833649591fa324cadbab7d6b667f4b (diff)
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/40x/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 65730275e012..14e027f5be66 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -35,7 +35,7 @@ config EP405
35config HCU4 35config HCU4
36 bool "Hcu4" 36 bool "Hcu4"
37 depends on 40x 37 depends on 40x
38 default y 38 default n
39 select 405GPR 39 select 405GPR
40 help 40 help
41 This option enables support for the Nestal Maschinen HCU4 board. 41 This option enables support for the Nestal Maschinen HCU4 board.