Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 31 insertions, 30 deletions

diff --git a/openembedded/packages/hostap/files/hostap_cs.conf b/openembedded/packages/hostap/files/hostap_cs.conf
index c5f46d8e71..abf9c7a247 100644
--- a/openembedded/packages/hostap/files/hostap_cs.conf
+++ b/openembedded/packages/hostap/files/hostap_cs.conf
@@ -1,9 +1,5 @@
 module "hostap_cs" opts "channel=3 iw_mode=2 essid=any ignore_cis_vcc=1"
 
-card "3Com AirConnect"
-  version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card"
-  bind "hostap_cs"
-
 card "Actiontec 802CI2"
   manfid 0x1668, 0x0101
   bind "hostap_cs"
@@ -59,10 +55,6 @@ card "HyperLink Wireless PC Card 11Mbps"
 #   manfid 0x0156, 0x0002
 #  bind "hostap_cs"
 
-card "Intel PRO/Wireless 2011"
-  manfid 0x0089, 0x0001
-  bind "hostap_cs"
-
 card "LA4111 Spectrum24 Wireless LAN PC Card"
   version "Symbol Technologies"
   bind "hostap_cs"
@@ -84,28 +76,8 @@ card "Linksys WLAN CF Card"
   manfid 0x0274, 0x3301
   bind "hostap_cs"
 
-card "MELCO WLI-PCM-L11"
-  version "MELCO", "WLI-PCM-L11"
-  bind "hostap_cs"
-
-card "MELCO WLI-PCM-L11G"
-  version "MELCO", "WLI-PCM-L11G"
-  bind "hostap_cs"
-
-card "MELCO WLI-PCM-L11G"
-  version "BUFFALO", "WLI-PCM-L11G"
-  bind "hostap_cs"
-
-card "Buffalo WLI2-CF-S11"
-  version "BUFFALO", "WLI2-CF-S11"
-  bind "hostap_cs"
-
 card "NETGEAR MA701 Wireless CF Card"
-manfid 0xd601, 0x0002
-bind "hostap_cs"
-
-card "NCR WaveLAN/IEEE Adapter"
-  version "NCR", "WaveLAN/IEEE"
+  manfid 0xd601, 0x0002
   bind "hostap_cs"
 
 card "Nortel Networks eMobility 802.11 Wireless Adapter"
@@ -177,9 +149,37 @@ card "Wireless LAN Adapter Version 01.02"
    bind "hostap_cs"
 
 card "Ambicom WL1100C 11Mbs Card 802.11b"
+  version "AmbiCom", "WL1100C 802.11b CF-Card", "2.2"
+  manfid 0xd601,0x0002
+  bind "hostap_cs"
+
+card "Ambicom WL1100C 11Mbs Card 802.11b"
   manfid 0xd601,0x0002
   bind "hostap_cs"
 
 card "Sandisk Connect SDWCFB-000"
   manfid 0xd601,0x0005
   bind "hostap_cs"
+
+# Cards with Intersil firmware (Prism chipset)
+
+card "Linksys WPC11 11Mbps 802.11b WLAN Card"
+  version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA"
+  bind "hostap_cs"
+
+card "Linksys CompactFlash Wireless Card"
+  version "Linksys", "Wireless CompactFlash Card"
+  bind "hostap_cs"
+
+card "ACTIONTEC PRISM Wireless LAN PC Card"
+  version "ACTIONTEC", "PRISM Wireless LAN PC Card"
+  bind "hostap_cs"
+
+card "Linksys WPC11 Version 3"
+  manfid 0x0274,0x1613
+  bind "hostap_cs"
+
+card "BENQ AWL100"
+  version "BENQ", "AWL100 PCMCIA ADAPTER"
+  bind "hostap_cs"
+
diff --git a/openembedded/packages/hostap/hostap-conf_1.0.bb b/openembedded/packages/hostap/hostap-conf_1.0.bb
index 6c9cb09e60..094722c845 100644
--- a/openembedded/packages/hostap/hostap-conf_1.0.bb
+++ b/openembedded/packages/hostap/hostap-conf_1.0.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
-PR = "r0"
+PR = "r4"
 
 SRC_URI = "file://hostap_cs.conf \
            file://hostap_cs.conf-upstream"