diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/configs/hackkit_defconfig | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/configs/hackkit_defconfig')
| -rw-r--r-- | arch/arm/configs/hackkit_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig index 1c8fb89a6730..db0708d5cbea 100644 --- a/arch/arm/configs/hackkit_defconfig +++ b/arch/arm/configs/hackkit_defconfig | |||
| @@ -91,7 +91,6 @@ CONFIG_ARCH_SA1100=y | |||
| 91 | # CONFIG_SA1100_COLLIE is not set | 91 | # CONFIG_SA1100_COLLIE is not set |
| 92 | # CONFIG_SA1100_H3100 is not set | 92 | # CONFIG_SA1100_H3100 is not set |
| 93 | # CONFIG_SA1100_H3600 is not set | 93 | # CONFIG_SA1100_H3600 is not set |
| 94 | # CONFIG_SA1100_H3800 is not set | ||
| 95 | # CONFIG_SA1100_BADGE4 is not set | 94 | # CONFIG_SA1100_BADGE4 is not set |
| 96 | # CONFIG_SA1100_JORNADA720 is not set | 95 | # CONFIG_SA1100_JORNADA720 is not set |
| 97 | CONFIG_SA1100_HACKKIT=y | 96 | CONFIG_SA1100_HACKKIT=y |