Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/24 21:19:13+01:00 (none)!XorA
Disable x apm usage for c7x0 device so we can get 2.6 suspend working

BKrev: 426bff5fkScuksvSY6yG1AiV6AUPdg

diff --git a/packages/xserver/xserver-kdrive/disable-apm.patch b/packages/xserver/xserver-kdrive/disable-apm.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 0cbdf2f..dc5ae19 100644 (file)
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -15,7 +15,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r0"
+PR = "r1"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -35,7 +35,10 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;
 SRC_URI_append_ramses = " file://onlyfb.patch;patch=1"
 SRC_URI_append_ramses = " file://devfs.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
+
 PACKAGE_ARCH_poodle = "poodle"
+PACKAGE_ARCH_c7x0 = "c7x0"
 
 S = "${WORKDIR}/xserver"