refresh 2.6.34 patches
SVN-Revision: 22451
This commit is contained in:
parent
332227b067
commit
3144d90706
4 changed files with 6 additions and 6 deletions
|
@ -23,7 +23,7 @@
|
||||||
/* The Mellanox Tavor device gives false positive parity errors
|
/* The Mellanox Tavor device gives false positive parity errors
|
||||||
* Mark this device with a broken_parity_status, to allow
|
* Mark this device with a broken_parity_status, to allow
|
||||||
* PCI scanning code to "skip" this now blacklisted device.
|
* 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);
|
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 */
|
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
||||||
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
|
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);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
|
||||||
|
|
||||||
#endif /* CONFIG_PCI_IOV */
|
#endif /* CONFIG_PCI_IOV */
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
|
|
||||||
--- a/include/linux/miscdevice.h
|
--- a/include/linux/miscdevice.h
|
||||||
+++ b/include/linux/miscdevice.h
|
+++ b/include/linux/miscdevice.h
|
||||||
@@ -12,6 +12,7 @@
|
@@ -18,6 +18,7 @@
|
||||||
#define APOLLO_MOUSE_MINOR 7
|
#define APOLLO_MOUSE_MINOR 7
|
||||||
#define PC110PAD_MINOR 9
|
#define PC110PAD_MINOR 9
|
||||||
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
|
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
|
||||||
|
|
|
@ -395,7 +395,7 @@
|
||||||
u32 pmucap;
|
u32 pmucap;
|
||||||
|
|
||||||
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
|
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",
|
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
|
||||||
cc->pmu.rev, pmucap);
|
cc->pmu.rev, pmucap);
|
||||||
|
|
||||||
|
@ -543,7 +543,7 @@
|
||||||
/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
|
/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
|
||||||
#define SPEX16(_outvar, _offset, _mask, _shift) \
|
#define SPEX16(_outvar, _offset, _mask, _shift) \
|
||||||
out->_outvar = ((in[SPOFF(_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;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < bus->sprom_size; i++)
|
for (i = 0; i < bus->sprom_size; i++)
|
||||||
|
|
|
@ -132,7 +132,7 @@
|
||||||
#ifndef CONFIG_MMU
|
#ifndef CONFIG_MMU
|
||||||
--- a/kernel/signal.c
|
--- a/kernel/signal.c
|
||||||
+++ b/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;
|
return sighand;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue