linux/3.3: refresh patches against 3.3-rc5

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30799 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2012-03-03 14:10:24 +00:00
parent e5a957c580
commit 0d81aed761
4 changed files with 5 additions and 5 deletions

View File

@ -244,7 +244,7 @@
======================== ========================
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -4924,6 +4924,13 @@ F: drivers/scsi/osd/ @@ -4928,6 +4928,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_* F: include/scsi/osd_*
F: fs/exofs/ F: fs/exofs/

View File

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -374,7 +374,7 @@ @@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS := -D__ASSEMBLY__ KBUILD_AFLAGS := -D__ASSEMBLY__
KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_AFLAGS_MODULE := -DMODULE
KBUILD_CFLAGS_MODULE := -DMODULE KBUILD_CFLAGS_MODULE := -DMODULE

View File

@ -10,8 +10,8 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{ {
u16 cmd; u16 cmd;
@@ -877,3 +879,5 @@ static void __devinit quirk_usb_early_ha @@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha
quirk_usb_handoff_xhci(pdev); pci_disable_device(pdev);
} }
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+ +

View File

@ -830,7 +830,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3019,6 +3019,11 @@ L: linuxppc-dev@lists.ozlabs.org @@ -3018,6 +3018,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes S: Odd Fixes
F: drivers/tty/hvc/ F: drivers/tty/hvc/