diff options
Diffstat (limited to 'packages/linux')
4 files changed, 37 insertions, 4 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch index 7a5b2d51cb..a0921dffe5 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/80-nslu2-io.patch @@ -8,9 +8,9 @@ +obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o nslu2-io.o obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o ---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,548 @@ +--- /dev/null 2005-12-25 02:27:49.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-io.c 2006-01-15 04:11:10.000000000 +1030 +@@ -0,0 +1,555 @@ +//============================================================================= +// +// n2-io.c version 0.1.7 @@ -48,6 +48,8 @@ +#include <asm-arm/irq.h> +#include <asm-arm/delay.h> + ++#include <asm/mach-types.h> ++ +/* Set this to 1 to output lots of debug messages. */ +#define NSLU2_IO_DEBUG 0 + @@ -505,6 +507,9 @@ + +static int __init n2iom_init(void) +{ ++ if (!machine_is_nslu2()) ++ return 0; ++ + printk(KERN_INFO "NSLU2: i/o, %s\n", VERSION); + + n2iom_initarch(); @@ -536,6 +541,8 @@ + +static void __exit n2iom_exit(void) +{ ++ if (!machine_is_nslu2()) ++ return 0; + +#ifndef CONFIG_LEDS + del_timer(&n2lm_rsg_timer); diff --git a/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch b/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch new file mode 100644 index 0000000000..ab8bdd8eae --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch @@ -0,0 +1,12 @@ +--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-power.c~ 2006-01-03 13:51:10.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-power.c 2006-01-15 03:57:59.000000000 +1030 +@@ -80,6 +80,9 @@ + + static void __exit nslu2_power_exit(void) + { ++ if (!(machine_is_nslu2())) ++ return 0; ++ + free_irq(NSLU2_RB_IRQ, NULL); + free_irq(NSLU2_PB_IRQ, NULL); + } diff --git a/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch b/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch new file mode 100644 index 0000000000..f02714beea --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch @@ -0,0 +1,12 @@ +--- linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-power.c~ 2006-01-15 00:22:38.000000000 +1030 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-power.c 2006-01-15 03:58:13.000000000 +1030 +@@ -58,6 +58,9 @@ + + static void __exit nas100d_power_exit(void) + { ++ if (!(machine_is_nas100d())) ++ return 0; ++ + free_irq(NAS100D_RB_IRQ, NULL); + } + diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 6da130772c..c2556b85f4 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # 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 = "r5.${PR_CONFIG}" +PR = "r6.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -28,6 +28,8 @@ IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1" IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" # IXP4XX_PATCHES += "file://75-nslu2-leds.patch;patch=1" IXP4XX_PATCHES += "file://80-nslu2-io.patch;patch=1" +IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1" +IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" |