diff options
| -rw-r--r-- | arch/arm/configs/h3600_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/Kconfig | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig index 1502957db2c3..f6aed7747d4d 100644 --- a/arch/arm/configs/h3600_defconfig +++ b/arch/arm/configs/h3600_defconfig | |||
| @@ -90,7 +90,6 @@ CONFIG_ARCH_SA1100=y | |||
| 90 | # CONFIG_SA1100_COLLIE is not set | 90 | # CONFIG_SA1100_COLLIE is not set |
| 91 | # CONFIG_SA1100_H3100 is not set | 91 | # CONFIG_SA1100_H3100 is not set |
| 92 | CONFIG_SA1100_H3600=y | 92 | CONFIG_SA1100_H3600=y |
| 93 | CONFIG_SA1100_H3XXX=y | ||
| 94 | # CONFIG_SA1100_BADGE4 is not set | 93 | # CONFIG_SA1100_BADGE4 is not set |
| 95 | # CONFIG_SA1100_JORNADA720 is not set | 94 | # CONFIG_SA1100_JORNADA720 is not set |
| 96 | # CONFIG_SA1100_HACKKIT is not set | 95 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index 81ffff7ed498..4e5c07f4e456 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig | |||
| @@ -71,11 +71,6 @@ config SA1100_H3600 | |||
| 71 | <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> | 71 | <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> |
| 72 | <http://www.compaq.com/products/handhelds/pocketpc/> | 72 | <http://www.compaq.com/products/handhelds/pocketpc/> |
| 73 | 73 | ||
| 74 | config SA1100_H3XXX | ||
| 75 | bool | ||
| 76 | depends on SA1100_H3100 || SA1100_H3600 | ||
| 77 | default y | ||
| 78 | |||
| 79 | config SA1100_BADGE4 | 74 | config SA1100_BADGE4 |
| 80 | bool "HP Labs BadgePAD 4" | 75 | bool "HP Labs BadgePAD 4" |
| 81 | select SA1111 | 76 | select SA1111 |
