diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-07 20:36:27 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-07 20:36:27 -0800 |
| commit | b981f980b068617e021736eb19092919fc7d0e53 (patch) | |
| tree | 6706abf3d8ab6353ef90962f39f854cdbe0b04a3 /arch/arm/configs/omap1_defconfig | |
| parent | e3a36c415adcea823458ff0a1c77757d99b83cfa (diff) | |
| parent | 6560ee07dc946e94f7cc2cd8e3b5a5f5ee7340c1 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/configs/omap1_defconfig')
| -rw-r--r-- | arch/arm/configs/omap1_defconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index a7e77758137..945a34f2a34 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -48,12 +48,7 @@ CONFIG_MACH_SX1=y CONFIG_MACH_NOKIA770=y CONFIG_MACH_AMS_DELTA=y CONFIG_MACH_OMAP_GENERIC=y -CONFIG_OMAP_ARM_216MHZ=y -CONFIG_OMAP_ARM_195MHZ=y -CONFIG_OMAP_ARM_192MHZ=y CONFIG_OMAP_ARM_182MHZ=y -CONFIG_OMAP_ARM_168MHZ=y -# CONFIG_OMAP_ARM_60MHZ is not set # CONFIG_ARM_THUMB is not set CONFIG_PCCARD=y CONFIG_OMAP_CF=y |