summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-11-28 23:50:44 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-11-28 23:50:44 +0000
commit3b0a73545371730ebe36bf749de235cd429203ff (patch)
treee82f8353a47406ff33a71cb370901580833d4823
parenteaac7450f805f25955d989e29e6128a58e2c2f81 (diff)
linux-2.6.23: Fixup of mpc8313e-rdb-leds.patch.
-rw-r--r--packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch6
-rw-r--r--packages/linux/linux_2.6.23.bb5
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
index cc5a120e4b..7eadfc61fe 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
@@ -18,7 +18,7 @@ Index: linux-2.6.23/drivers/leds/Kconfig
Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 00:32:27.000000000 +0100
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 00:45:42.000000000 +0100
@@ -0,0 +1,128 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
@@ -35,10 +35,10 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
++#include <linux/ioport.h>
+#include <linux/leds.h>
+#include <linux/err.h>
+#include <asm/io.h>
-+#include <asm/ioport.h>
+
+int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
+ int assignment, int has_irq);
@@ -119,7 +119,7 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
+
+static int __init mpc8313leds_init(void)
+{
-+ led_mem = request_mem_region(0xfa000000, 0x100);
++ led_mem = request_mem_region(0xfa000000, 0x100, "mpc8313-leds");
+ if (led_mem == NULL) return -ENOMEM;
+ p = ioremap(0xfa000000, 0x100);
+ if (p == NULL)
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index 1fa028745b..6d9a3c718d 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_cm-x270 = "1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
-PR = "r5"
+PR = "r6"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://binutils-buildid-arm.patch;patch=1 \
@@ -24,7 +24,8 @@ SRC_URI_append_cm-x270 = "\
file://0008-cm-x270-nand-simplify-name.patch;patch=1"
SRC_URI_append_mpc8313e-rdb = "\
- file://mpc831x-nand.patch;patch=1"
+ file://mpc831x-nand.patch;patch=1 \
+ file://mpc8313e-rdb-leds.patch;patch=1"
SRC_URI_append_mpc8323e-rdb = "\
file://mpc832x-leds.patch;patch=1"