[oe-commits] org.oe.dev linux-2.6.23: Fixup of mpc8313e-rdb-leds.patch.

[likewise commit]

linux-2.6.23: Fixup of mpc8313e-rdb-leds.patch.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: f477e212a4365a149188e6bbaba24edd50e70a19
ViewMTN: http://monotone.openembedded.org/revision/info/f477e212a4365a149188e6bbaba24edd50e70a19
Files:
1
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux_2.6.23.bb
Diffs:

#
# mt diff -r417a59ef634353c5321894a4fe1fe25ea3eab3f7 -rf477e212a4365a149188e6bbaba24edd50e70a19
#
# 
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [8df0acfa3ac3ad43c58aca4c7ad6ef348e152016]
#    to [73675fe25a8fbdb8b9a32f1405498f94fbdd6c12]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [45c1b7177dff55702c2f6482f8dc4d5b673e87bd]
#    to [24ff32f454e2986756b191f3d2024191467b032b]
# 
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	8df0acfa3ac3ad43c58aca4c7ad6ef348e152016
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	73675fe25a8fbdb8b9a32f1405498f94fbdd6c12
@@ -18,7 +18,7 @@ Index: linux-2.6.23/drivers/leds/leds-mp
 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-mp
 +
 +#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-mp
 +
 +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)
============================================================
--- packages/linux/linux_2.6.23.bb	45c1b7177dff55702c2f6482f8dc4d5b673e87bd
+++ packages/linux/linux_2.6.23.bb	24ff32f454e2986756b191f3d2024191467b032b
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_mpc8323e-rdb = "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_mpc8313e-rdb = "\
 	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"