diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-01 18:55:46 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-01 18:55:46 +0000 |
| commit | c86b3ddcf69512ba5158fd378fec5eb899ce56aa (patch) | |
| tree | 867c92b44e2c9a5346253030091c545c0df6c4ba /packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4 | |
| parent | 605b7120333087d63100f9e72a8dd606f86e1741 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/28 15:08:05+00:00 nexus.co.uk!pb
disable in-tree atmel drivers
2005/02/28 15:04:25+00:00 nexus.co.uk!pb
enable airo_cs driver for ipaqpxa
2005/02/28 14:51:09+00:00 nexus.co.uk!pb
tweak x11 versioning
BKrev: 4224bab2IqEMqBKAk_iCH4qNiYetFA
Diffstat (limited to 'packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4')
| -rw-r--r-- | packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 index ba8d20522f..97aeac5392 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 @@ -567,13 +567,13 @@ CONFIG_AIRO_CS=m # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_CS is not set CONFIG_NET_WIRELESS=y -CONFIG_ATMELWLAN=y +# CONFIG_ATMELWLAN is not set # CONFIG_ATMELWLAN_USB_503A_RFMD is not set -CONFIG_ATMELWLAN_PCMCIA_502A=m -CONFIG_ATMELWLAN_PCMCIA_3COM=m +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set # CONFIG_ATMELWLAN_PCMCIA_502AD is not set # CONFIG_ATMELWLAN_PCMCIA_502AE is not set -CONFIG_ATMELWLAN_PCMCIA_504=m +# CONFIG_ATMELWLAN_PCMCIA_504 is not set # # Token Ring devices |