diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 16:39:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 16:39:06 -0800 |
commit | 4ec8f077e4dd51f713984669781e7b568b8c41e2 (patch) | |
tree | 4c951595e2824b19ca9d9c7190a6046481322c14 /arch/arm/configs/corgi_defconfig | |
parent | a6e470fd1bbfea8e51d2b10b0713e802b782f19a (diff) | |
parent | af38d90d6a5e135b546a3f86222ba2ad895ba4ae (diff) | |
download | op-kernel-dev-4ec8f077e4dd51f713984669781e7b568b8c41e2.zip op-kernel-dev-4ec8f077e4dd51f713984669781e7b568b8c41e2.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
Allow architectures to override copy_user_highpage()
[ARM] pxa/palmtx: misc fixes to use generic GPIO API
ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling
[ARM] pxa/corgi: update default config to exclude tosa from being built
[ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
ARM: OMAP: Typo fix for clock_allow_idle
ARM: OMAP: Remove broken LCD driver for SX1
[ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0
[ARM] pxa/MioA701: bluetooth resume fix
[ARM] pxa/MioA701: fix memory corruption.
Diffstat (limited to 'arch/arm/configs/corgi_defconfig')
-rw-r--r-- | arch/arm/configs/corgi_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index f3af0b5..9876543 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y # CONFIG_MACH_AKITA is not set # CONFIG_MACH_SPITZ is not set # CONFIG_MACH_BORZOI is not set -CONFIG_MACH_TOSA=y +# CONFIG_MACH_TOSA is not set # CONFIG_ARCH_VIPER is not set # CONFIG_ARCH_PXA_ESERIES is not set # CONFIG_TRIZEPS_PXA is not set |