3.0 patches

3 files changed, 37 insertions, 28 deletions

diff --git a/queue-3.0/cnic-fix-port_mode-setting.patch b/queue-3.0/cnic-fix-port_mode-setting.patch
deleted file mode 100644
index 209d73879d..0000000000
--- a/queue-3.0/cnic-fix-port_mode-setting.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b7d40315c9643034ac4b5c9dda480d0124416f89 Mon Sep 17 00:00:00 2001
-From: Michael Chan <mchan@broadcom.com>
-Date: Wed, 13 Jul 2011 17:24:18 +0000
-Subject: cnic: Fix port_mode setting
-
-From: Michael Chan <mchan@broadcom.com>
-
-commit b7d40315c9643034ac4b5c9dda480d0124416f89 upstream.
-
-CHIP_2_PORT_MODE was not set correctly.
-
-Signed-off-by: Michael Chan <mchan@broadcom.com>
-Reviewed-by: Matt Carlson <mcarlson@broadcom.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---- a/drivers/net/cnic.c
-+++ b/drivers/net/cnic.c
-@@ -4834,7 +4834,7 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)
- 			cp->port_mode = CHIP_4_PORT_MODE;
- 			cp->pfid = func >> 1;
- 		} else {
--			cp->port_mode = CHIP_4_PORT_MODE;
-+			cp->port_mode = CHIP_2_PORT_MODE;
- 			cp->pfid = func & 0x6;
- 		}
- 	} else {
diff --git a/queue-3.0/series b/queue-3.0/series
index 6639b47f09..2b5d9af9be 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -203,4 +203,4 @@ isci-fix-event-get-pointer-increment.patch
 ahci-raid-mode-sata-patch-for-intel-panther-point-deviceids.patch
 bluetooth-fix-timeout-on-scanning-for-the-second-time.patch
 libiscsi_tcp-fix-lld-data-allocation.patch
-cnic-fix-port_mode-setting.patch
+usb-host-pci-quirks.c-correct-annotation-of.patch
diff --git a/queue-3.0/usb-host-pci-quirks.c-correct-annotation-of.patch b/queue-3.0/usb-host-pci-quirks.c-correct-annotation-of.patch
new file mode 100644
index 0000000000..bc1e253905
--- /dev/null
+++ b/queue-3.0/usb-host-pci-quirks.c-correct-annotation-of.patch
@@ -0,0 +1,36 @@
+From a7e6401e19aa54924ab11ee548afaad0a55ffdc6 Mon Sep 17 00:00:00 2001
+From: Arnaud Lacombe <lacombar@gmail.com>
+Date: Thu, 21 Jul 2011 13:16:20 -0400
+Subject: usb/host/pci-quirks.c: correct annotation of `ehci_dmi_nohandoff_table'
+
+From: Arnaud Lacombe <lacombar@gmail.com>
+
+commit a7e6401e19aa54924ab11ee548afaad0a55ffdc6 upstream.
+
+ehci_bios_handoff() is marked __devinit, `ehci_dmi_nohandoff_table' should be
+marked __devinitconst, not __initconst. This fixes the following section
+mismatch:
+
+WARNING: vmlinux.o(.devinit.text+0x4f08): Section mismatch in reference from the function ehci_bios_handoff() to the variable .init.rodata:ehci_dmi_nohandoff_table
+The function __devinit ehci_bios_handoff() references a variable __initconst ehci_dmi_nohandoff_table.
+If ehci_dmi_nohandoff_table is only used by ehci_bios_handoff then annotate ehci_dmi_nohandoff_table with a matching annotation.
+
+Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/host/pci-quirks.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -535,7 +535,7 @@ static void __devinit quirk_usb_handoff_
+ 	iounmap(base);
+ }
+ 
+-static const struct dmi_system_id __initconst ehci_dmi_nohandoff_table[] = {
++static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = {
+ 	{
+ 		/*  Pegatron Lucid (ExoPC) */
+ 		.matches = {