diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-09-08 13:39:04 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-09-08 13:39:04 +0000 |
| commit | 22d4d1fb84d1b4f7635f65d14a673e5210f9a5b6 (patch) | |
| tree | 6d0487ece60ed099506df5ca1907b8c6330e387e /target | |
| parent | a70686ddc61237ff998768f33b8a5878135db6bf (diff) | |
| download | upstream-22d4d1fb84d1b4f7635f65d14a673e5210f9a5b6.tar.gz upstream-22d4d1fb84d1b4f7635f65d14a673e5210f9a5b6.tar.bz2 upstream-22d4d1fb84d1b4f7635f65d14a673e5210f9a5b6.zip | |
ar71xx: refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33334 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
6 files changed, 11 insertions, 17 deletions
diff --git a/target/linux/ar71xx/patches-3.3/406-mtd-m25p80-allow-to-specify-max-read-size.patch b/target/linux/ar71xx/patches-3.3/406-mtd-m25p80-allow-to-specify-max-read-size.patch index 86d9535802..8861c615fa 100644 --- a/target/linux/ar71xx/patches-3.3/406-mtd-m25p80-allow-to-specify-max-read-size.patch +++ b/target/linux/ar71xx/patches-3.3/406-mtd-m25p80-allow-to-specify-max-read-size.patch @@ -87,7 +87,7 @@ mutex_unlock(&flash->lock); -@@ -924,6 +950,12 @@ static int __devinit m25p_probe(struct s +@@ -925,6 +951,12 @@ static int __devinit m25p_probe(struct s flash->mtd.erase = m25p80_erase; flash->mtd.read = m25p80_read; diff --git a/target/linux/ar71xx/patches-3.3/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-3.3/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch index fd78019104..14f2de536c 100644 --- a/target/linux/ar71xx/patches-3.3/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch +++ b/target/linux/ar71xx/patches-3.3/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -1017,7 +1017,9 @@ static int __devinit m25p_probe(struct s +@@ -1018,7 +1018,9 @@ static int __devinit m25p_probe(struct s /* partitions should match sector boundaries; and it may be good to * use readonly partitions for writeprotected sectors (BP2..BP0). */ diff --git a/target/linux/ar71xx/patches-3.3/412-mtd-m25p80-zero-partition-parser-data.patch b/target/linux/ar71xx/patches-3.3/412-mtd-m25p80-zero-partition-parser-data.patch index a32a19629c..a667139d01 100644 --- a/target/linux/ar71xx/patches-3.3/412-mtd-m25p80-zero-partition-parser-data.patch +++ b/target/linux/ar71xx/patches-3.3/412-mtd-m25p80-zero-partition-parser-data.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -977,6 +977,7 @@ static int __devinit m25p_probe(struct s +@@ -978,6 +978,7 @@ static int __devinit m25p_probe(struct s if (info->flags & M25P_NO_ERASE) flash->mtd.flags |= MTD_NO_ERASE; diff --git a/target/linux/ar71xx/patches-3.3/430-drivers-link-spi-before-mtd.patch b/target/linux/ar71xx/patches-3.3/430-drivers-link-spi-before-mtd.patch index e081087f2f..f54861be6c 100644 --- a/target/linux/ar71xx/patches-3.3/430-drivers-link-spi-before-mtd.patch +++ b/target/linux/ar71xx/patches-3.3/430-drivers-link-spi-before-mtd.patch @@ -1,6 +1,6 @@ --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -51,8 +51,8 @@ obj-$(CONFIG_IDE) += ide/ +@@ -52,8 +52,8 @@ obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_ATA) += ata/ obj-$(CONFIG_TARGET_CORE) += target/ diff --git a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch index 34965dcda8..10fefd067e 100644 --- a/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.3/610-MIPS-ath79-openwrt-machines.patch @@ -679,7 +679,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -36,9 +36,62 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += pci-ath9k-fixup.o +@@ -36,9 +36,62 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += p # # Machines # diff --git a/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch b/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch index 9c054da5b4..bc4e6695e8 100644 --- a/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch +++ b/target/linux/ar71xx/patches-3.3/612-ALL0315N-support.patch @@ -1,7 +1,5 @@ -Index: linux-3.3.8/arch/mips/ath79/Kconfig -=================================================================== ---- linux-3.3.8.orig/arch/mips/ath79/Kconfig -+++ linux-3.3.8/arch/mips/ath79/Kconfig +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig @@ -38,6 +38,15 @@ config ATH79_MACH_ALL0258N select ATH79_DEV_LEDS_GPIO select ATH79_DEV_M25P80 @@ -18,10 +16,8 @@ Index: linux-3.3.8/arch/mips/ath79/Kconfig config ATH79_MACH_AP113 bool "Atheros AP113 board support" select SOC_AR724X -Index: linux-3.3.8/arch/mips/ath79/Makefile -=================================================================== ---- linux-3.3.8.orig/arch/mips/ath79/Makefile -+++ linux-3.3.8/arch/mips/ath79/Makefile +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += p obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o @@ -30,10 +26,8 @@ Index: linux-3.3.8/arch/mips/ath79/Makefile obj-$(CONFIG_ATH79_MACH_AP113) += mach-ap113.o obj-$(CONFIG_ATH79_MACH_AP121) += mach-ap121.o obj-$(CONFIG_ATH79_MACH_AP136) += mach-ap136.o -Index: linux-3.3.8/arch/mips/ath79/machtypes.h -=================================================================== ---- linux-3.3.8.orig/arch/mips/ath79/machtypes.h -+++ linux-3.3.8/arch/mips/ath79/machtypes.h +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h @@ -20,6 +20,7 @@ enum ath79_mach_type { ATH79_MACH_ALFA_NX, /* ALFA Network N2/N5 board */ ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ |