diff options
| author | Jiri Kosina | 2010-02-02 23:10:39 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2010-02-02 23:10:39 +0100 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /arch/arm/configs/omap_h4_2420_defconfig | |
| parent | HID: use multi input quirk for eTurboTouch touchscreen (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-qcow2-linux-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.gz kernel-qcow2-linux-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.xz kernel-qcow2-linux-e1a0bdd8022317e98650e70850de73eccfcde5ad.zip | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'arch/arm/configs/omap_h4_2420_defconfig')
| -rw-r--r-- | arch/arm/configs/omap_h4_2420_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig index a4aab8e4c29b..b12b406c1960 100644 --- a/arch/arm/configs/omap_h4_2420_defconfig +++ b/arch/arm/configs/omap_h4_2420_defconfig @@ -201,7 +201,6 @@ CONFIG_MACH_OMAP_H4=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_V6=y # CONFIG_CPU_32v6K is not set CONFIG_CPU_32v6=y |