diff options
| author | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-12 16:15:12 +0000 |
|---|---|---|
| committer | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-12 16:15:12 +0000 |
| commit | 82b6ff28f087a5603d5c1c30fad0a8495434b9dc (patch) | |
| tree | 269ea5a9268983f33fe3481739b9e960e5420520 /target/linux/ar7/patches-2.6.22 | |
| parent | 2223f6edd948ee1be00dfe412b9160ee31d08c0b (diff) | |
Enabled working ar7_wdt, style cleanups
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.22')
| -rw-r--r-- | target/linux/ar7/patches-2.6.22/110-flash.patch | 5 | ||||
| -rw-r--r-- | target/linux/ar7/patches-2.6.22/500-serial_kludge.patch | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-2.6.22/110-flash.patch b/target/linux/ar7/patches-2.6.22/110-flash.patch index b10406754..6edc353e9 100644 --- a/target/linux/ar7/patches-2.6.22/110-flash.patch +++ b/target/linux/ar7/patches-2.6.22/110-flash.patch @@ -28,12 +28,13 @@ diff -Nru linux-2.6.19.2/drivers/mtd/Makefile linux-ar7/drivers/mtd/Makefile diff -Nru linux-2.6.19.2/drivers/mtd/maps/physmap.c linux-ar7/drivers/mtd/maps/physmap.c --- linux-2.6.19.2/drivers/mtd/maps/physmap.c 2006-12-12 02:32:53.000000000 +0700 +++ linux-ar7/drivers/mtd/maps/physmap.c 2007-02-03 21:57:11.000000000 +0700 -@@ -74,7 +74,7 @@ +@@ -74,7 +74,8 @@ static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; #ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; -+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL }; ++static const char *part_probe_types[] = {"cmdlinepart", "RedBoot", ++ "ar7part", NULL }; #endif static int physmap_flash_probe(struct platform_device *dev) diff --git a/target/linux/ar7/patches-2.6.22/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.22/500-serial_kludge.patch index 9292a4cef..c6bd3a778 100644 --- a/target/linux/ar7/patches-2.6.22/500-serial_kludge.patch +++ b/target/linux/ar7/patches-2.6.22/500-serial_kludge.patch @@ -38,13 +38,14 @@ diff -urN linux-2.6.22.orig/include/linux/serial_core.h linux-2.6.22/include/lin diff -urN linux-2.6.22.orig/include/linux/serialP.h linux-2.6.22/include/linux/serialP.h --- linux-2.6.22.orig/include/linux/serialP.h 2007-07-09 01:32:17.000000000 +0200 +++ linux-2.6.22/include/linux/serialP.h 2007-07-11 03:08:57.000000000 +0200 -@@ -135,6 +135,9 @@ +@@ -135,6 +135,10 @@ * the interrupt line _up_ instead of down, so if we register the IRQ * while the UART is in that state, we die in an IRQ storm. */ #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2) +#elif defined(CONFIG_AR7) +/* This is how it is set up by bootloader... */ -+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR) ++#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \ ++ | UART_MCR_RTS | UART_MCR_DTR) #else #define ALPHA_KLUDGE_MCR 0 #endif |