diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-23 07:05:31 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-23 07:05:31 +0000 |
| commit | d535733c00164b7bc206a7f963aa9154b495d2c7 (patch) | |
| tree | eb303a6aadf92abe5a29f07497ae7056d21140af /packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch | |
| parent | 4850c121b25bfdd9bc0647a2a111bcc2eadb4c16 (diff) | |
ixp4xx-kernel: update to nslu2 beeper class from CVS in 2.6.15.1
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch b/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch index 2502b6518d..83043d9c2d 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch @@ -2,17 +2,22 @@ NEW_LEDS support for the LinkSys NSLU2 Signed-off-by: John Bowler <jbowler@acm.org> ---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 -@@ -17,6 +17,7 @@ + arch/arm/mach-ixp4xx/nslu2-setup.c | 51 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 50 insertions(+), 1 deletion(-) + +--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:13:58.000000000 +0100 ++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:14:51.000000000 +0100 +@@ -17,6 +17,9 @@ #include <linux/serial.h> #include <linux/serial_8250.h> #include <linux/mtd/mtd.h> ++#ifdef CONFIG_LEDS_CLASS +#include <linux/leds.h> ++#endif #include <asm/setup.h> #include <asm/memory.h> -@@ -50,6 +51,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_ +@@ -50,6 +53,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_ .scl_pin = NSLU2_SCL_PIN, }; @@ -55,15 +60,15 @@ Signed-off-by: John Bowler <jbowler@acm.org> static struct platform_device nslu2_i2c_controller = { .name = "IXP4XX-I2C", .id = 0, -@@ -103,7 +140,6 @@ static struct platform_device nslu2_uart +@@ -109,7 +148,6 @@ static struct platform_device nslu2_uart static struct platform_device *nslu2_devices[] __initdata = { &nslu2_i2c_controller, &nslu2_flash, - &nslu2_uart, + &nslu2_beeper, }; - static void nslu2_power_off(void) -@@ -164,7 +200,18 @@ static void __init nslu2_init(void) +@@ -171,7 +209,18 @@ static void __init nslu2_init(void) pm_power_off = nslu2_power_off; |