merge of 028fac41fd6e3c12693a33f64dc1e331c0270149

     and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484

35 files changed, 381 insertions, 712 deletions

diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 885bf40b4f..b1dcd7fe3b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1,4 +1,43 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+PCMCIA_MANAGER ?= "pcmciautils"
 
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+                             kernel-module-g-serial kernel-module-g-ether"
+
+# Wireless Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
+                             hostap-conf orinoco-conf"
+
+# Sound Modules
+###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
+                             kernel-module-snd-pcm  \
+                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+			     
+###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "
diff --git a/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch b/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch
new file mode 100644
index 0000000000..b216711c99
--- /dev/null
+++ b/packages/gpe-session-scripts/files/fix-small-fonts-SL-Cxxxx.patch
@@ -0,0 +1,13 @@
+--- gpe-session-scripts-0.66/X11/xsettings.default.orig	2006-03-29 19:31:24.356027984 +0200
++++ gpe-session-scripts-0.66/X11/xsettings.default	2006-03-29 19:31:38.532872776 +0200
+@@ -1,8 +1,8 @@
+ Gtk/IconSizes:S:gtk-dialog=30,30:gtk-button=16,16
+ Gtk/ToolbarIconSize:I:1
+ Gtk/ToolbarStyle:I:2
+-Gtk/FontName:S:Sans 7
+-MATCHBOX/Desktop/Font:S:Sans 7
++Gtk/FontName:S:Sans 12
++MATCHBOX/Desktop/Font:S:Sans 12
+ Net/ThemeName:S:Default
+ MATCHBOX/Background:S:col-solid:#1f00a2
+ 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
index c57366399d..ab006e7278 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 inherit gpe
 
@@ -16,12 +16,15 @@ SRC_URI += "file://matchbox-session \
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
-SRC_URI_append_borzoi = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
 
+# While SL-Cxxxx has a 200dpi screen, too, a fontsize < 10 is barely readable
+SRC_URI_append_akita += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1"
+SRC_URI_append_borzoi += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1"
+SRC_URI_append_spitz += " file://fix-small-fonts-SL-Cxxxx.patch;patch=1"
+
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
index 8ef83c2830..a0ffca6320 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
 key=....F12:-:~matchbox-remote -next
 key=...*F12:-:~matchbox-remote -desktop
-#key=....F11:-:~matchbox-remote -menu
+key=....F11:-:~matchbox-remote -menu
 #key=...*1:-:~zoom out
 #key=...*2:-:~zoom in
 key=...*3:-:~display-brightness.sh down 
diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc
index 8ef83c2830..a0ffca6320 100644
--- a/packages/keylaunch/files/borzoi/keylaunchrc
+++ b/packages/keylaunch/files/borzoi/keylaunchrc
@@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
 key=....F12:-:~matchbox-remote -next
 key=...*F12:-:~matchbox-remote -desktop
-#key=....F11:-:~matchbox-remote -menu
+key=....F11:-:~matchbox-remote -menu
 #key=...*1:-:~zoom out
 #key=...*2:-:~zoom in
 key=...*3:-:~display-brightness.sh down 
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
index 8ef83c2830..a0ffca6320 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar
 key=....F13:-:sylpheed
 key=....F12:-:~matchbox-remote -next
 key=...*F12:-:~matchbox-remote -desktop
-#key=....F11:-:~matchbox-remote -menu
+key=....F11:-:~matchbox-remote -menu
 #key=...*1:-:~zoom out
 #key=...*2:-:~zoom in
 key=...*3:-:~display-brightness.sh down 
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index c0d0b2c44a..a1c13188ca 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
  program is already running, keylaunch can bring its window to the front\
  rather than just running another copy."
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://keylaunchrc"
 
diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map
new file mode 100644
index 0000000000..4640bd56d4
--- /dev/null
+++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map
@@ -0,0 +1,7 @@
+# Finnish keymapping
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+
diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map
new file mode 100644
index 0000000000..4640bd56d4
--- /dev/null
+++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map
@@ -0,0 +1,7 @@
+# Finnish keymapping
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+
diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map
new file mode 100644
index 0000000000..4640bd56d4
--- /dev/null
+++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map
@@ -0,0 +1,7 @@
+# Finnish keymapping
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+
diff --git a/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map
new file mode 100644
index 0000000000..314db5843a
--- /dev/null
+++ b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map
@@ -0,0 +1,7 @@
+# Finnish keymappings
+shift altgr keycode 63  = +Adiaeresis
+shift altgr keycode 13 = +Odiaeresis
+altgr keycode 63  = +adiaeresis
+altgr keycode 13 = +odiaeresis
+
+keycode 103 = AltGr
\ No newline at end of file
diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map
new file mode 100644
index 0000000000..4640bd56d4
--- /dev/null
+++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map
@@ -0,0 +1,7 @@
+# Finnish keymapping
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index f1b479d47a..e54fea1d2d 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -4,20 +4,21 @@ PRIORITY = "optional"
 MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://*.map"
 
 # If any python guru wants to setup PACKAGES_$machine with some code instead,
-# be my guet =)
-PACKAGES_akita = "keymap-extension-de"
-PACKAGES_spitz = "keymap-extension-de"
-PACKAGES_borzoi = "keymap-extension-de"
-PACKAGES_c7x0 = "keymap-extension-de"
-PACKAGES_collie = "keymap-extension-de"
+# be my guest =)
+PACKAGES_akita = "keymap-extension-de keymap-extension-fi"
+PACKAGES_spitz = "keymap-extension-de keymap-extension-fi"
+PACKAGES_borzoi = "keymap-extension-de keymap-extension-fi"
+PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi"
+PACKAGES_collie = "keymap-extension-de keymap-extension-fi"
 
 FILES_keymap-extension-de = "/etc/*-de.map"
 FILES_keymap-extension-fr = "/etc/*-fr.map"
+FILES_keymap-extension-fi = "/etc/*-fi.map"
 
 do_install() {
 	install -d ${D}/${sysconfdir}
diff --git a/packages/zd1211/zd1211-20050822/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zd1211/zd1211-20050822/.mtn2git_empty
+++ b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty
diff --git a/packages/matchbox-wm/matchbox-wm/akita/kbdconfig b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig
new file mode 100644
index 0000000000..7de0071c08
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig
@@ -0,0 +1,51 @@
+#
+# This is an example keyboard config file for matchbox
+#
+# You can edit this file or change per user by copying to 
+#  ~/.matchbox/kbdconfig
+#
+# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
+
+### Window operation short cuts 
+
+<Alt>n=next
+<Alt>p=prev
+<Alt>c=close
+<Alt>d=desktop
+<Alt>m=!matchbox-remote -mbmenu
+
+### App launching.
+
+<ctrl><alt>x=!xterm
+<ctrl><alt>r=!rxvt
+
+### App launching with startup notify
+
+<ctrl><alt>e=!!gpe-calender
+
+### windows style key shortcuts
+
+<alt>Tab=next
+<alt><shift>Tab=prev
+
+<alt>space=taskmenu
+<alt>escape=!matchbox-remote -mbmenu
+<alt>f4=close
+
+# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function
+# to this key via keylaunch, this must be commented out. 
+# NOTE: Uncommenting this usually means that matchbox crashes on startup!
+#
+# f11=fullscreen
+
+### super should be a 'window' key, uncomment '#' if you have one.
+
+#<super>d=desktop
+#<super>r=!xterm
+#<super>e=!!nautilus
+
+### Special keys, likely probably only available on extended keyboards. 
+
+#App=!matchbox-remote -mbmenu
+#Menu=!matchbox-remote -mbmenu
+
diff --git a/packages/zd1211/zd1211-r52/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zd1211/zd1211-r52/.mtn2git_empty
+++ b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty
diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig
new file mode 100644
index 0000000000..7de0071c08
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig
@@ -0,0 +1,51 @@
+#
+# This is an example keyboard config file for matchbox
+#
+# You can edit this file or change per user by copying to 
+#  ~/.matchbox/kbdconfig
+#
+# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
+
+### Window operation short cuts 
+
+<Alt>n=next
+<Alt>p=prev
+<Alt>c=close
+<Alt>d=desktop
+<Alt>m=!matchbox-remote -mbmenu
+
+### App launching.
+
+<ctrl><alt>x=!xterm
+<ctrl><alt>r=!rxvt
+
+### App launching with startup notify
+
+<ctrl><alt>e=!!gpe-calender
+
+### windows style key shortcuts
+
+<alt>Tab=next
+<alt><shift>Tab=prev
+
+<alt>space=taskmenu
+<alt>escape=!matchbox-remote -mbmenu
+<alt>f4=close
+
+# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function
+# to this key via keylaunch, this must be commented out. 
+# NOTE: Uncommenting this usually means that matchbox crashes on startup!
+#
+# f11=fullscreen
+
+### super should be a 'window' key, uncomment '#' if you have one.
+
+#<super>d=desktop
+#<super>r=!xterm
+#<super>e=!!nautilus
+
+### Special keys, likely probably only available on extended keyboards. 
+
+#App=!matchbox-remote -mbmenu
+#Menu=!matchbox-remote -mbmenu
+
diff --git a/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty
diff --git a/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig
new file mode 100644
index 0000000000..7de0071c08
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig
@@ -0,0 +1,51 @@
+#
+# This is an example keyboard config file for matchbox
+#
+# You can edit this file or change per user by copying to 
+#  ~/.matchbox/kbdconfig
+#
+# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
+
+### Window operation short cuts 
+
+<Alt>n=next
+<Alt>p=prev
+<Alt>c=close
+<Alt>d=desktop
+<Alt>m=!matchbox-remote -mbmenu
+
+### App launching.
+
+<ctrl><alt>x=!xterm
+<ctrl><alt>r=!rxvt
+
+### App launching with startup notify
+
+<ctrl><alt>e=!!gpe-calender
+
+### windows style key shortcuts
+
+<alt>Tab=next
+<alt><shift>Tab=prev
+
+<alt>space=taskmenu
+<alt>escape=!matchbox-remote -mbmenu
+<alt>f4=close
+
+# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function
+# to this key via keylaunch, this must be commented out. 
+# NOTE: Uncommenting this usually means that matchbox crashes on startup!
+#
+# f11=fullscreen
+
+### super should be a 'window' key, uncomment '#' if you have one.
+
+#<super>d=desktop
+#<super>r=!xterm
+#<super>e=!!nautilus
+
+### Special keys, likely probably only available on extended keyboards. 
+
+#App=!matchbox-remote -mbmenu
+#Menu=!matchbox-remote -mbmenu
+
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index 7654ebd94c..c17ce96252 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 PV = "0.9.5+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb
new file mode 100644
index 0000000000..cfe57653a2
--- /dev/null
+++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+PV = "0.8.0+svn${SRCDATE}"
+PROVIDES = "qemu-native"
+
+SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \
+           file://configure.patch;patch=1"
+           
+S = "${WORKDIR}/trunk"
+
+inherit autotools native
+
+EXTRA_OECONF = "--disable-gcc-check --target-list=arm-user,arm-softmmu --disable-gfx-check"
+
+prefix = "${STAGING_DIR}/${BUILD_SYS}"
+
+# tested to work with gcc4 for arm target only
+# this is purely for others to test, not intended to be used as a replacement for the real qemu
diff --git a/packages/zd1211/zd1211-20050822/access_ok.patch b/packages/zd1211/zd1211-20050822/access_ok.patch
deleted file mode 100644
index 95fbb592b0..0000000000
--- a/packages/zd1211/zd1211-20050822/access_ok.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zd1211/src/zd1205.c.orig	2005-10-06 03:30:27.200837520 +0200
-+++ zd1211/src/zd1205.c	2005-10-06 03:29:37.176442384 +0200
-@@ -4434,7 +4434,7 @@
- 				{ SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" },
-  			};
- 
--			err = verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
-+			err = access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
- 			if (err)
- 				break;
- 
diff --git a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch b/packages/zd1211/zd1211-20050822/iwconfig-rate.patch
deleted file mode 100644
index c1cb634b1a..0000000000
--- a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- zd1211/src/zd1205.c	7 Jun 2005 21:45:21 -0000	1.17
-+++ zd1211/src/zd1205.c	24 Aug 2005 11:39:29 -0000
-@@ -3599,9 +3599,59 @@
- 
- }
- 
-+static const unsigned long zd1205_rates[] = {
-+	/* RATE_1M,  0  */
-+	1000000,
-+	/* RATE_2M,  1  */
-+	2000000,
-+	/* RATE_5M,  2  */
-+	5500000,
-+	/* RATE_11M, 3  */
-+	11000000,
-+	/* RATE_6M,  4  */
-+	600000,
-+	/* RATE_9M,  5  */
-+	9000000,
-+	/* RATE_12M, 6  */
-+	12000000,
-+	/* RATE_18M, 7  */
-+	18000000,
-+	/* RATE_24M, 8  */
-+	24000000,
-+	/* RATE_36M, 9  */
-+	36000000,
-+	/* RATE_48M, 10 */
-+	48000000,
-+	/* RATE_54M, 11 */
-+	54000000,
-+};
-+
-+#define ZD1205_NRATES ((sizeof(zd1205_rates))/(sizeof(unsigned long)))
-+
- static int zd1205_ioctl_setrate(struct net_device *dev, struct iw_param *frq)
- {
--	return 0;
-+	struct zd1205_private *macp = dev->priv;
-+	U8 rate;
-+	if(frq->value < 0) {
-+		/* Auto */
-+		macp->bFixedRate = 0;
-+		macp->AdapterMaxRate = RATE_54M;
-+		return 0;
-+	}
-+	for(rate = 0; rate < ZD1205_NRATES; rate++)
-+		if(zd1205_rates[rate] == frq->value) {
-+			zd1205_lock(macp);
-+			macp->bFixedRate = frq->fixed;
-+			if(frq->fixed)
-+				macp->cardSetting.FixedRate = rate;
-+			else {
-+				macp->AdapterMaxRate = rate;
-+				macp->cardSetting.TxRate = rate;
-+			}
-+			zd1205_unlock(macp);
-+			return 0;
-+		}
-+	return -EINVAL;
- }
- 
- static int zd1205_ioctl_getrate(struct net_device *dev, struct iw_param *frq)
-@@ -3612,60 +3662,9 @@
- 	frq->disabled = 0;
- 	frq->value = 0;
- 
--	switch(macp->cardSetting.CurrTxRate)
--	{
--	case RATE_1M:
--		frq->value = 1000000;
--		break;
--
--	case RATE_2M:
--		frq->value = 2000000;
--		break;
--
--	case RATE_5M:
--		frq->value = 5500000;
--		break;
--
--	case RATE_11M:
--		frq->value = 11000000;
--		break;
--
--	case RATE_6M:
--		frq->value = 600000;
--		break;
--
--	case RATE_9M:
--		frq->value = 9000000;
--		break;
--
--	case RATE_12M:
--		frq->value = 12000000;
--		break;
--
--	case RATE_18M:
--		frq->value = 18000000;
--		break;
--
--	case RATE_24M:
--		frq->value = 24000000;
--		break;
--
--	case RATE_36M:
--		frq->value = 36000000;
--		break;
--
--	case RATE_48M:
--		frq->value = 48000000;
--		break;
--
--	case RATE_54M:
--		frq->value = 54000000;
--		break;
--
--	default:
-+	if(macp->cardSetting.CurrTxRate > ZD1205_NRATES)
- 		return -EINVAL;
--	}
--
-+	frq->value = zd1205_rates[macp->cardSetting.CurrTxRate];
- 	return 0;
- }
- 
diff --git a/packages/zd1211/zd1211-20050822/makefile.patch b/packages/zd1211/zd1211-20050822/makefile.patch
deleted file mode 100644
index 91f3192d4d..0000000000
--- a/packages/zd1211/zd1211-20050822/makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zd1211/Makefile.orig	2005-04-15 12:34:32.000000000 -1000
-+++ zd1211/Makefile	2005-09-02 02:40:41.857339000 -1000
-@@ -90,7 +90,7 @@
- ifeq ($(KVER), 2.6) # we're on a 2.6.x kernel
- 	$(MAKE) V=0 -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
- else
--	$(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) depend modules
-+	$(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
- endif
- 
- $(SRC_DIR)/zddevlist.h:	$(SRC_DIR)/zddevlist
diff --git a/packages/zd1211/zd1211-20050822/urb-async.patch b/packages/zd1211/zd1211-20050822/urb-async.patch
deleted file mode 100644
index cd1149e766..0000000000
--- a/packages/zd1211/zd1211-20050822/urb-async.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- zd1211/src/zd1211.c.orig	2005-03-27 22:47:35.000000000 +0200
-+++ zd1211/src/zd1211.c	2005-10-06 02:53:23.380909536 +0200
-@@ -313,7 +313,6 @@
- 	} else {
- 		usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pBuffer, DataLen,zd1211_reg_cb, macp);
- 	}
--	macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 
- 	if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
- 		printk(KERN_ERR "zd1211: failed reg_urb\n");
-@@ -362,7 +361,6 @@
- 	} else {
- 		usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
- 	}
--	macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 	if ((ret = SUBMIT_URB(macp->reg_urb, memflags))) {
- 		printk(KERN_ERR "zd1211: failed reg_urb\n");
- 		zd1211_DumpErrorCode(macp, ret);
-@@ -426,7 +424,6 @@
- 	} else {
- 		usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
- 	}
--	macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 
- 	if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
- 		printk(KERN_ERR "zd1211: failed reg_urb\n");
-@@ -569,7 +566,6 @@
- 		usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp);
- 	}
- 
--	macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 	if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
- 		printk(KERN_ERR "zd1211: failed reg_urb\n");
- 		zd1211_DumpErrorCode(macp, ret);
-@@ -1240,7 +1236,6 @@
- 			pRegBuffer, bufSize,
- 			zd1211_reg_cb, macp);
- 
--	macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 
- 	if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) {
- 		printk(KERN_ERR "zd1211: failed rf reg_urb\n");
-@@ -1311,7 +1306,6 @@
- 		return;
- 
- 	printk("%s: Tx timed out.\n", dev->name);
--	macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 	USB_URB(macp->tx_urb);
- }
- 
-@@ -1384,7 +1378,6 @@
- 			zd1211_intr_cb, macp);
- #endif
- 
--	macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 
- 	if ((res = SUBMIT_URB(macp->intr_urb, GFP_KERNEL))) {
- 		printk(KERN_ERR "zd1211: failed intr_urb\n");
-@@ -1822,7 +1815,6 @@
- 			  macp->IntEPBuffer, MAX_EPINT_BUFFER,
- 			  zd1211_intr_cb, macp);
- 
--	macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK;
- 	status = SUBMIT_URB(macp->intr_urb, GFP_ATOMIC);
- 
- 	if (status)