diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 15:36:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-09 15:36:31 -0700 |
commit | d80d6fc08e111c411a349c4fa0c6d9bf41851087 (patch) | |
tree | c6cb9ab6099ffd9e34c6e67372283eeba283a0ea /arch/arm/mach-sa1100/Kconfig | |
parent | 99fdb2fe523480a8748a5af18139bb1f7785c815 (diff) | |
parent | 07c6d48fd10a8eeae899e06876aa0b885a8e2a1b (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100/Kconfig')
-rw-r--r-- | arch/arm/mach-sa1100/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index 50cde576dadf..6923316b3d0d 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig @@ -150,7 +150,7 @@ config SA1100_SSP config H3600_SLEEVE tristate "Compaq iPAQ Handheld sleeve support" - depends on SA1100_H3600 + depends on SA1100_H3100 || SA1100_H3600 help Choose this option to enable support for extension packs (sleeves) for the Compaq iPAQ H3XXX series of handheld computers. This option |