diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-07-29 17:20:25 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-07-29 17:20:25 +0000 |
| commit | b8d60bb9d489ac508614f3463c2e523fc8780794 (patch) | |
| tree | 444af6ef86ef9c6c27c71fc3951aba2c01b72a91 /target | |
| parent | daf10573bab33e2c31704247877d2b248835edb6 (diff) | |
| download | upstream-b8d60bb9d489ac508614f3463c2e523fc8780794.tar.gz upstream-b8d60bb9d489ac508614f3463c2e523fc8780794.tar.bz2 upstream-b8d60bb9d489ac508614f3463c2e523fc8780794.zip | |
target/linux: refresh kernel patches
SVN-Revision: 22413
Diffstat (limited to 'target')
4 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch index a44ebd5b9c..3ea41569da 100644 --- a/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch +++ b/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -53,6 +53,12 @@ +@@ -52,6 +52,12 @@ + #define SST49LF008A 0x005a #define AT49BV6416 0x00d6 - #define MANUFACTURER_SAMSUNG 0x00ec +/* Macronix */ +#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */ @@ -13,7 +13,7 @@ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -@@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru +@@ -282,6 +288,41 @@ static void fixup_s29gl032n_sectors(stru } } @@ -55,7 +55,7 @@ static struct cfi_fixup cfi_fixup_table[] = { { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL }, #ifdef AMD_BOOTLOC_BUG -@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = +@@ -318,6 +359,9 @@ static struct cfi_fixup fixup_table[] = */ { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL }, { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL }, diff --git a/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch index cd08ea14f7..2854428e18 100644 --- a/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch @@ -23,7 +23,7 @@ /* The Mellanox Tavor device gives false positive parity errors * Mark this device with a broken_parity_status, to allow * PCI scanning code to "skip" this now blacklisted device. -@@ -1884,7 +1885,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1887,7 +1888,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,7 +33,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2516,6 +2519,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2522,6 +2525,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ diff --git a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch index 4b0369059e..cd4d0f7756 100644 --- a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch +++ b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch @@ -55,7 +55,7 @@ #include <linux/kallsyms.h> #include <linux/notifier.h> #include <linux/module.h> -@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, +@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, dump_stack(); #endif diff --git a/target/linux/generic/patches-2.6.32/980-vm_exports.patch b/target/linux/generic/patches-2.6.32/980-vm_exports.patch index c226ac7bf1..b80eb25198 100644 --- a/target/linux/generic/patches-2.6.32/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.32/980-vm_exports.patch @@ -124,7 +124,7 @@ #ifndef CONFIG_MMU --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -1070,6 +1070,7 @@ struct sighand_struct *lock_task_sighand +@@ -1072,6 +1072,7 @@ struct sighand_struct *lock_task_sighand return sighand; } |