diff options
| author | merge <null@invalid> | 2009-01-19 20:44:45 +0000 |
|---|---|---|
| committer | Andy Green <agreen@cpc3-nthc5-0-0-cust764.nrth.cable.ntl.com> | 2009-01-19 20:44:45 +0000 |
| commit | 1655ed19960a1597a93540a45e4a554c1139cf63 (patch) | |
| tree | 575bd68bb3be7eff0366375ec2f76fcf0b57983c /arch | |
| parent | 66282b96965c5bdc80a71f09f47cf861e37108c9 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-update-gta02-default-configura-1232397413
pending-tracking-hist top was MERGE-via-stable-tracking-update-gta02-default-configura-1232397413 / fdaef96a49003c3e907629757f489585ea6708ab ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-update-gta02-default-configura
stable-tracking-hist top was update-gta02-default-configura / ae4b4dc366b578f90cd85eda9348d3f7e585670c ... parent commitmessage:
From: Werner Almesberger <werner@openmoko.org>
update GTA02 default configurations
Add the settings introduced by the previous two patches to the default
configurations.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/gta02-moredrivers-defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index 1184e790d80..1bab0eee69b 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -1591,6 +1591,8 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set CONFIG_AR6000_WLAN=y +# CONFIG_AR6000_WLAN_DEBUG is not set +# CONFIG_AR6000_WLAN_RESET is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y |