diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-01 12:41:09 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-01 12:41:09 +0000 |
| commit | 03699ac8758aa814176bcd1a55b441ddd8431b92 (patch) | |
| tree | e19c7fbfcdafe9e460306c91cecd9f84cdaf1457 /target | |
| parent | f839bab3fd375bae7c763ca4f1f5521551b6cb31 (diff) | |
| download | upstream-03699ac8758aa814176bcd1a55b441ddd8431b92.tar.gz upstream-03699ac8758aa814176bcd1a55b441ddd8431b92.tar.bz2 upstream-03699ac8758aa814176bcd1a55b441ddd8431b92.zip | |
[kernel] refresh 2.6.34 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22451 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch index 0cf19789ae..4b2a839ab9 100644 --- a/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.34/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. -@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1904,7 +1905,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) { -@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2556,6 +2559,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.34/971-ocf_20100325.patch b/target/linux/generic/patches-2.6.34/971-ocf_20100325.patch index c34a7e2657..bda63729c7 100644 --- a/target/linux/generic/patches-2.6.34/971-ocf_20100325.patch +++ b/target/linux/generic/patches-2.6.34/971-ocf_20100325.patch @@ -98,7 +98,7 @@ --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h -@@ -12,6 +12,7 @@ +@@ -18,6 +18,7 @@ #define APOLLO_MOUSE_MINOR 7 #define PC110PAD_MINOR 9 /*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */ diff --git a/target/linux/generic/patches-2.6.34/975-ssb_update.patch b/target/linux/generic/patches-2.6.34/975-ssb_update.patch index 6525a10306..9eae96d54c 100644 --- a/target/linux/generic/patches-2.6.34/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.34/975-ssb_update.patch @@ -395,7 +395,7 @@ u32 pmucap; if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU)) -@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon +@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, pmucap); @@ -543,7 +543,7 @@ /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */ #define SPEX16(_outvar, _offset, _mask, _shift) \ out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift)) -@@ -254,7 +254,7 @@ static int sprom_do_read(struct ssb_bus +@@ -254,7 +254,7 @@ static int sprom_do_read(struct ssb_bus int i; for (i = 0; i < bus->sprom_size; i++) diff --git a/target/linux/generic/patches-2.6.34/980-vm_exports.patch b/target/linux/generic/patches-2.6.34/980-vm_exports.patch index 5d0b5c6970..72ed97a469 100644 --- a/target/linux/generic/patches-2.6.34/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.34/980-vm_exports.patch @@ -132,7 +132,7 @@ #ifndef CONFIG_MMU --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand +@@ -1123,6 +1123,7 @@ struct sighand_struct *lock_task_sighand return sighand; } |