diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-10 15:08:28 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-10 15:08:28 +0000 |
| commit | 126a87196ce4e7ea80c71692c22514f6cb549820 (patch) | |
| tree | 333f3c15891a91643ba22329bf8622ab4ba87095 /target/linux/amazon/patches-2.6.32 | |
| parent | b722ce28afb482ccdff01d4b28b7adc55f8c2ed6 (diff) | |
amazon: Upgrade amazon target to kernel 2.6.37
This was just a little bit tested on an SAMSUNG SMT-G3020 and pci and usb do not work like before.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26576 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/amazon/patches-2.6.32')
| -rw-r--r-- | target/linux/amazon/patches-2.6.32/100-board.patch | 2 | ||||
| -rw-r--r-- | target/linux/amazon/patches-2.6.32/140-net_drivers.patch | 2 | ||||
| -rw-r--r-- | target/linux/amazon/patches-2.6.32/160-cfi-swap.patch | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/amazon/patches-2.6.32/100-board.patch b/target/linux/amazon/patches-2.6.32/100-board.patch index d1d9c471a..b109b13c6 100644 --- a/target/linux/amazon/patches-2.6.32/100-board.patch +++ b/target/linux/amazon/patches-2.6.32/100-board.patch @@ -33,7 +33,7 @@ source "arch/mips/bcm63xx/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -296,6 +296,13 @@ cflags-$(CONFIG_SOC_AU1X00) += -I$(srctr +@@ -298,6 +298,13 @@ cflags-$(CONFIG_SOC_AU1X00) += -I$(srctr # diff --git a/target/linux/amazon/patches-2.6.32/140-net_drivers.patch b/target/linux/amazon/patches-2.6.32/140-net_drivers.patch index e64908c76..322420b8e 100644 --- a/target/linux/amazon/patches-2.6.32/140-net_drivers.patch +++ b/target/linux/amazon/patches-2.6.32/140-net_drivers.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -286,3 +286,6 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o +@@ -285,3 +285,6 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_SFC) += sfc/ obj-$(CONFIG_WIMAX) += wimax/ diff --git a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch b/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch index bb89f6110..48b84f4c0 100644 --- a/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch +++ b/target/linux/amazon/patches-2.6.32/160-cfi-swap.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1079,6 +1079,9 @@ static int __xipram do_write_oneword(str +@@ -1107,6 +1107,9 @@ static int __xipram do_write_oneword(str int retry_cnt = 0; adr += chip->start; @@ -10,7 +10,7 @@ spin_lock(chip->mutex); ret = get_chip(map, chip, adr, FL_WRITING); -@@ -1361,7 +1364,11 @@ static int __xipram do_write_buffer(stru +@@ -1389,7 +1392,11 @@ static int __xipram do_write_buffer(stru z = 0; while(z < words * map_bankwidth(map)) { datum = map_word_load(map, buf); @@ -22,7 +22,7 @@ z += map_bankwidth(map); buf += map_bankwidth(map); -@@ -1606,6 +1613,9 @@ static int __xipram do_erase_oneblock(st +@@ -1634,6 +1641,9 @@ static int __xipram do_erase_oneblock(st int ret = 0; adr += chip->start; @@ -32,7 +32,7 @@ spin_lock(chip->mutex); ret = get_chip(map, chip, adr, FL_ERASING); -@@ -1734,6 +1744,10 @@ static int do_atmel_lock(struct map_info +@@ -1762,6 +1772,10 @@ static int do_atmel_lock(struct map_info struct cfi_private *cfi = map->fldrv_priv; int ret; @@ -43,7 +43,7 @@ spin_lock(chip->mutex); ret = get_chip(map, chip, adr + chip->start, FL_LOCKING); if (ret) -@@ -1770,6 +1784,10 @@ static int do_atmel_unlock(struct map_in +@@ -1798,6 +1812,10 @@ static int do_atmel_unlock(struct map_in struct cfi_private *cfi = map->fldrv_priv; int ret; |