aboutsummaryrefslogtreecommitdiffstats
path: root/arch/h8300
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-09-13 11:24:25 -0400
committerPaul Mackerras <paulus@samba.org>2007-09-13 11:24:25 -0400
commitb2315372eac9cd9f622c32a93e323cf6f0f03462 (patch)
tree9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/h8300
parent5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff)
parentc87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff)
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/h8300')
-rw-r--r--arch/h8300/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug
index 554efe604a08..996d97e953b0 100644
--- a/arch/h8300/Kconfig.debug
+++ b/arch/h8300/Kconfig.debug
@@ -59,7 +59,7 @@ config BLKDEV_RESERVE
59 help 59 help
60 Reserved BLKDEV area. 60 Reserved BLKDEV area.
61 61
62config CONFIG_BLKDEV_RESERVE_ADDRESS 62config BLKDEV_RESERVE_ADDRESS
63 hex 'start address' 63 hex 'start address'
64 depends on BLKDEV_RESERVE 64 depends on BLKDEV_RESERVE
65 help 65 help