diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 10:58:03 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 10:58:03 +0000 |
| commit | 0fc3447849ba0984e4892fe9cf0006852b65c12d (patch) | |
| tree | 35c6225c1bc7734c4c829fea1aa2f65431a4c066 /target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch | |
| parent | 468bd067074db26753ce7118b04b1eb9c15fe561 (diff) | |
[ixp4xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11204 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch index a6fda86276..00a51bc31a 100644 --- a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch @@ -1,15 +1,16 @@ -diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c ---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-11 01:06:33.000000000 -0500 -@@ -17,6 +17,7 @@ - #include <linux/serial_8250.h> +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -18,6 +18,7 @@ #include <linux/leds.h> + #include <linux/i2c-gpio.h> +#include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -142,6 +143,35 @@ static void nas100d_power_off(void) +@@ -163,6 +164,35 @@ static void nas100d_power_off(void) gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -44,8 +45,8 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/a + static void __init nas100d_init(void) { - ixp4xx_sys_init(); -@@ -170,6 +200,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d" + uint8_t __iomem *f; +@@ -221,6 +251,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d" .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .boot_params = 0x00000100, |