diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-04-13 21:12:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-13 21:12:30 +0000 |
| commit | 7433407652c663be27c32ce050d54c2db91df5e1 (patch) | |
| tree | d16ce4599a1075cf4b5763d237445ec4b6535667 /packages | |
| parent | 66765f0c5310b0a8702c35f8c78fcb4f730245f4 (diff) | |
ixp4xx-kernel: Fixed the name of the disk led on the nas100d.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch | 22 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.16.bb | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch index ceb4b8b2f8..60b6bbd4c9 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch @@ -6,17 +6,17 @@ Signed-off-by: John Bowler <jbowler@acm.org> arch/arm/mach-ixp4xx/nas100d-setup.c | 43 ++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) ---- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-21 01:40:40.000000000 +0100 -+++ linux-ixp4xx/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-21 01:53:48.000000000 +0100 -@@ -16,6 +16,7 @@ - #include <linux/serial.h> - #include <linux/serial_8250.h> +--- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-03-27 13:45:22.000000000 +0200 ++++ linux-ixp4xx/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-03-27 13:46:00.000000000 +0200 +@@ -18,6 +18,7 @@ #include <linux/mtd/mtd.h> + #include <linux/netdevice.h> + #include <linux/etherdevice.h> +#include <linux/leds.h> - #include <asm/setup.h> - #include <asm/memory.h> -@@ -42,6 +43,36 @@ static struct platform_device nas100d_fl + #include <asm/mach-types.h> + #include <asm/mach/arch.h> +@@ -41,6 +42,36 @@ static struct platform_device nas100d_fl .resource = &nas100d_flash_resource, }; @@ -35,7 +35,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> + .flags = IXP4XX_GPIO_LOW, + }, + { -+ .name = "disk-1", /* yellow led */ ++ .name = "disk", /* yellow led */ + .start = 3, + .end = 3, + .flags = IXP4XX_GPIO_LOW, @@ -53,7 +53,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = { .sda_pin = NAS100D_SDA_PIN, .scl_pin = NAS100D_SCL_PIN, -@@ -100,7 +131,6 @@ static struct platform_device nas100d_ua +@@ -99,7 +130,6 @@ static struct platform_device nas100d_ua static struct platform_device *nas100d_devices[] __initdata = { &nas100d_i2c_controller, &nas100d_flash, @@ -61,7 +61,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> }; static void nas100d_power_off(void) -@@ -160,7 +190,18 @@ static void __init nas100d_init(void) +@@ -187,7 +217,18 @@ static void __init nas100d_init(void) pm_power_off = nas100d_power_off; diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index f2fad6b415..7d48711d8b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -8,7 +8,7 @@ PR_CONFIG = "2" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r1.${PR_CONFIG}" +PR = "r2.${PR_CONFIG}" include ixp4xx-kernel.inc |