summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-02-16 07:27:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-16 07:27:02 +0000
commit692e603a21a591fb73452e884bbfdb32f4028401 (patch)
treea1762eaeb576a28c9a014ce68cecbae73515d4a4
parent496f2934a30e4c1cfd1ba1f064356772d62fa7d3 (diff)
linux-openzaurus-2.6.15: fix gcc4 compilation, fixes bug #676, thanks to Eric Shattow
-rw-r--r--packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch29
-rw-r--r--packages/linux/linux-openzaurus_2.6.15.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch
new file mode 100644
index 0000000000..ea82d9ca97
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch
@@ -0,0 +1,29 @@
+diff -bur linux-2.6.15~orig/drivers/ide/ide-disk.c linux-2.6.15/drivers/ide/ide-disk.c
+--- linux-2.6.15~orig/drivers/ide/ide-disk.c 2006-02-11 00:02:50.000000000 -0600
++++ linux-2.6.15/drivers/ide/ide-disk.c 2006-02-11 00:11:20.000000000 -0600
+@@ -158,6 +158,12 @@
+ return 0; /* lba_capacity value may be bad */
+ }
+
++static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors)
++{
++ led_trigger_event(ide_led_trigger, LED_OFF);
++ ide_end_request(drive, uptodate, nr_sectors);
++}
++
+ /*
+ * __ide_do_rw_disk() issues READ and WRITE commands to a disk,
+ * using LBA if supported, or CHS otherwise, to address sectors.
+@@ -330,12 +336,6 @@
+ return __ide_do_rw_disk(drive, rq, block);
+ }
+
+-static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors)
+-{
+- led_trigger_event(ide_led_trigger, LED_OFF);
+- ide_end_request(drive, uptodate, nr_sectors);
+-}
+-
+ /*
+ * Queries for true maximum capacity of the drive.
+ * Returns maximum LBA address (> 0) of the drive, 0 if failed.
diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb
index cffc0cc673..cfd02bb25c 100644
--- a/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/packages/linux/linux-openzaurus_2.6.15.bb
@@ -80,6 +80,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
${RPSRC}/pxa-linking-bug.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
+ file://gcc4-ledclass-static-order-hack.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \