Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/bitkeeper/openembedded

2005/05/13 23:24:15-07:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/13 23:11:16+02:00 handhelds.org!zecke
libsdl-qpe:
	Patch by Gints Polis to fix the rotation for h38xx iPAQ
	models.

2005/05/13 22:38:41+02:00 handhelds.org!zecke
Qt 2.3.10:
	Patch Qt to support Right To Left scripting of text.
	Patch is courtsey ALynch, the Makefile.in changes are
	done by myself

2005/05/13 12:27:57+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 12:27:36+02:00 hrw.one.pl!hrw
added opie-icon-reload to opie-image - it is small and usefull

2005/05/13 12:13:04+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/13 12:12:52+02:00 uni-frankfurt.de!mickeyl
apply the libqpe fix-titleheight patch for the cvs version as well, since I feel uncomfortable pushing it upstream

2005/05/13 11:36:47+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 11:33:38+02:00 hrw.one.pl!hrw
opie-calculator: add files from etc/ to get unit conversations work - patch by Gints Polis

2005/05/13 10:25:00+01:00 rpsys.net!RP
bump

2005/05/13 10:22:43+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/13 10:12:15+01:00 rpsys.net!RP
linux-oz-2.6: Fix suspend/resume issue + add mmc timeout fix

2005/05/13 01:12:31+02:00 uni-frankfurt.de!mickeyl
add pcmciautils 003

2005/05/13 00:45:29+02:00 uni-frankfurt.de!mickeyl
add infrared and ppp modules to c7x0 bootstrap image (kernel 2.6)

2005/05/13 00:23:22+02:00 uni-frankfurt.de!mickeyl
remove meta-grant and gpe-image-grant: please don't commit private .bb files

2005/05/13 00:11:21+02:00 uni-frankfurt.de!mickeyl
spectrum_cs: catch up with linux 2.6.12

2005/05/12 23:54:13+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/12 23:45:30+02:00 uni-frankfurt.de!mickeyl
remove opie-mobilemsg, it has been removed upstream also

2005/05/12 23:09:32+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/12 23:08:58+02:00 utwente.nl!koen
Add kanatest_0.3.6.bb, kanatest.inc, kanatest.desktop, courtesy Robert Marcano

2005/05/12 20:32:38+01:00 nexus.co.uk!pb
new xinerama snapshot


2005/05/12 20:30:35+01:00 nexus.co.uk!pb
use linux-core directory instead of linux

2005/05/12 20:29:34+01:00 nexus.co.uk!pb
update xserver-xorg to 6.8.99.5


2005/05/12 20:27:09+01:00 nexus.co.uk!pb
update mythtv to 0.17


2005/05/12 20:26:18+01:00 nexus.co.uk!pb
correct "--enablee" typo in mythtv_0.16


2005/05/12 20:20:30+01:00 nexus.co.uk!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.nexus.co.uk:/nexus/home/pb/oe/oe

2005/05/09 09:10:48+01:00 nexus.co.uk!pb
add CELF busybox patch for more ash builtins

BKrev: 42859a7e_yqKTfUGEQQRWFA_fBpqQQ

2 files changed, 6 insertions, 17 deletions

diff --git a/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
index d230909506..0ab46eabad 100644
--- a/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
+++ b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
@@ -5,7 +5,7 @@
 
 --- /dev/null
 +++ orinoco-0.13e-SN-6/spectrum_cs.c
-@@ -0,0 +1,1220 @@
+@@ -0,0 +1,1209 @@
 +/*
 + * spectrum_cs.c
 + *
@@ -284,8 +284,6 @@
 +#define CS_CHECK(fn, ret) \
 +       do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 +
-+static void spectrum_cs_error(client_handle_t handle, int func, int ret);
-+
 +/*
 + * Reset the card using configuration registers COR and CCSR.
 + * If IDLE is 1, stop the firmware, so that it can be safely rewritten.
@@ -339,7 +337,7 @@
 +	return 0;
 +
 +      cs_failed:
-+	spectrum_cs_error(link->handle, last_fn, last_ret);
++	cs_error(link->handle, last_fn, last_ret);
 +	return -ENODEV;
 +}
 +
@@ -606,15 +604,6 @@
 +/* PCMCIA stuff     						    */
 +/********************************************************************/
 +
-+/* In 2.5 (as of 2.5.69 at least) there is a cs_error exported which
-+ * does this, but it's not in 2.4 so we do our own for now. */
-+static void
-+spectrum_cs_error(client_handle_t handle, int func, int ret)
-+{
-+	error_info_t err = { func, ret };
-+	pcmcia_report_error(handle, &err);
-+}
-+
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +/* Remove zombie instances (card removed, detach pending) */
 +static void
@@ -705,7 +694,7 @@
 +
 +	ret = pcmcia_register_client(&link->handle, &client_reg);
 +	if (ret != CS_SUCCESS) {
-+		spectrum_cs_error(link->handle, RegisterClient, ret);
++		cs_error(link->handle, RegisterClient, ret);
 +		spectrum_cs_detach(link);
 +		return NULL;
 +	}
@@ -1007,7 +996,7 @@
 +	return;
 +
 + cs_failed:
-+	spectrum_cs_error(link->handle, last_fn, last_ret);
++	cs_error(link->handle, last_fn, last_ret);
 +
 + failed:
 +	spectrum_cs_release(link);
@@ -5798,7 +5787,7 @@
 +0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x02,0x00,
 +0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x33,0x05,
 +};
---- orinoco-0.13e-SN-6/Makefile~add-spectrum-support
+--- orinoco-0.13e-SN-6/Makefile~add-spectrum-support.patch
 +++ orinoco-0.13e-SN-6/Makefile
 @@ -20,7 +20,7 @@
  endif
diff --git a/packages/orinoco/orinoco-modules_0.13e-26.bb b/packages/orinoco/orinoco-modules_0.13e-26.bb
index 688a5e622c..b2d882253e 100644
--- a/packages/orinoco/orinoco-modules_0.13e-26.bb
+++ b/packages/orinoco/orinoco-modules_0.13e-26.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.tzi.de/~plasmahh/orinoco-0.13e-SN-6.tar.bz2 \
            file://orinoco_cs.conf"
 S = "${WORKDIR}/orinoco-0.13e-SN-6"
 
-PR = "r2"
+PR = "r3"
 
 # use only w/ kernel 2.6
 DEFAULT_PREFERENCE_arm = "-1"