diff options
author | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
commit | fc457fa7c0cdbfe96812ba377e508880d600298f (patch) | |
tree | 514049d61cf8b1587141a375ba3ec4f71e09a9db /arch/arm/mach-pxa/Kconfig | |
parent | cc6e8de8f0fab61760bb7091fb19eef1406e17be (diff) | |
parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) |
Merge ../linus/
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 526acbc32067..2a58499c0968 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -77,6 +77,8 @@ config MACH_AKITA | |||
77 | depends PXA_SHARPSL_27x | 77 | depends PXA_SHARPSL_27x |
78 | select PXA_SHARP_Cxx00 | 78 | select PXA_SHARP_Cxx00 |
79 | select MACH_SPITZ | 79 | select MACH_SPITZ |
80 | select I2C | ||
81 | select I2C_PXA | ||
80 | 82 | ||
81 | config MACH_SPITZ | 83 | config MACH_SPITZ |
82 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | 84 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |