diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /arch/arm/mach-pxa/Kconfig | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index e201aa9765b9..cd506646801a 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -72,6 +72,12 @@ config MACH_HUSKY | |||
| 72 | depends PXA_SHARPSL_25x | 72 | depends PXA_SHARPSL_25x |
| 73 | select PXA_SHARP_C7xx | 73 | select PXA_SHARP_C7xx |
| 74 | 74 | ||
| 75 | config MACH_AKITA | ||
| 76 | bool "Enable Sharp SL-1000 (Akita) Support" | ||
| 77 | depends PXA_SHARPSL_27x | ||
| 78 | select PXA_SHARP_Cxx00 | ||
| 79 | select MACH_SPITZ | ||
| 80 | |||
| 75 | config MACH_SPITZ | 81 | config MACH_SPITZ |
| 76 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | 82 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |
| 77 | depends PXA_SHARPSL_27x | 83 | depends PXA_SHARPSL_27x |