summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/sim/Kconfig
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-12-01 10:56:43 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-12-01 10:56:43 +0100
commitbd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch)
tree3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/ia64/hp/sim/Kconfig
parent[MTD] bugfix: DataFlash is not bit writable (diff)
parentLinux 2.6.19 (diff)
downloadlinux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.tar.xz
linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/hp/sim/Kconfig')
-rw-r--r--arch/ia64/hp/sim/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/sim/Kconfig b/arch/ia64/hp/sim/Kconfig
index 18ccb1266e18..f92306bbedb8 100644
--- a/arch/ia64/hp/sim/Kconfig
+++ b/arch/ia64/hp/sim/Kconfig
@@ -13,8 +13,8 @@ config HP_SIMSERIAL_CONSOLE
depends on HP_SIMSERIAL
config HP_SIMSCSI
- tristate "Simulated SCSI disk"
- depends on SCSI
+ bool "Simulated SCSI disk"
+ depends on SCSI=y
endmenu