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

diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/defconfig-h3900 b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/defconfig-h3900
index 98dc92a..d72096c 100644 (file)
--- a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/defconfig-h3900
+++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.5/defconfig-h3900
@@ -585,7 +585,7 @@ CONFIG_NET_RADIO=y
 # CONFIG_HERMES is not set
 # CONFIG_SPECTRUM24T is not set
 # CONFIG_PCMCIA_HERMES is not set
-# CONFIG_AIRO_CS is not set
+CONFIG_AIRO_CS=m
 # CONFIG_WVLAN_CS is not set
 # CONFIG_MWVLAN_CS is not set
 # CONFIG_HOSTAP is not set

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
index ed083d5..c10d058 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"

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 ba8d205..97aeac5 100644 (file)
--- 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

diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
index cc042d5..7f878b9 100644 (file)
--- a/packages/x11/x11_cvs.bb
+++ b/packages/x11/x11_cvs.bb
@@ -1,4 +1,4 @@
-PV = "6.2.1+cvs${CVSDATE}"
+PV = "6.2.1cvs${CVSDATE}"
 LICENSE = "XFree86"
 PR = "r2"
 SECTION = "x11/libs"