diff options
8 files changed, 15 insertions, 14 deletions
diff --git a/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch index 351bf3093c3a0a..3223798074432e 100644 --- a/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out: --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c -@@ -398,8 +398,8 @@ static int __init cosa_init(void) +@@ -388,8 +388,8 @@ static int __init cosa_init(void) goto out_chrdev; } for (i = 0; i < nr_cards; i++) @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + "cosa%d", i); err = 0; goto out; - + --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -429,11 +429,11 @@ static int __init init_mac80211_hwsim(vo diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index a71a3e928e4c8f..b216217c8ce2bd 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/init.h +++ b/include/linux/init.h -@@ -142,6 +142,7 @@ extern initcall_t __security_initcall_st +@@ -143,6 +143,7 @@ extern int do_one_initcall(initcall_t fn extern char __initdata boot_command_line[]; extern char *saved_command_line; extern unsigned int reset_devices; @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -788,12 +788,21 @@ static void run_init_process(char *init_ +@@ -790,12 +790,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } @@ -170,3 +170,4 @@ usb/usb-gotemp.patch #ns/modpost +driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch diff --git a/usb.current/usb-add-musb-and-tusb-support.patch b/usb.current/usb-add-musb-and-tusb-support.patch index 9d90a94a8d18bf..683a027c9fbe3f 100644 --- a/usb.current/usb-add-musb-and-tusb-support.patch +++ b/usb.current/usb-add-musb-and-tusb-support.patch @@ -15915,7 +15915,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif /* OMAP2 */ --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2914,6 +2914,12 @@ M: jirislaby@gmail.com +@@ -2928,6 +2928,12 @@ M: jirislaby@gmail.com L: linux-kernel@vger.kernel.org S: Maintained diff --git a/usb.current/usb-auerswald-remove-driver.patch b/usb.current/usb-auerswald-remove-driver.patch index 63db4f1b1395b9..3dcda14f6c2d62 100644 --- a/usb.current/usb-auerswald-remove-driver.patch +++ b/usb.current/usb-auerswald-remove-driver.patch @@ -2278,7 +2278,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_USB_CYTHERM) += cytherm.o --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4181,12 +4181,6 @@ M: oliver@neukum.name +@@ -4195,12 +4195,6 @@ M: oliver@neukum.name L: linux-usb@vger.kernel.org S: Maintained diff --git a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch index 2bf23bb9904580..f2bcb7cd70bea0 100644 --- a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch +++ b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch @@ -19,9 +19,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ b/drivers/usb/gadget/omap_udc.c @@ -54,6 +54,7 @@ - #include <asm/arch/dma.h> - #include <asm/arch/usb.h> -+#include <asm/arch/control.h> + #include <mach/dma.h> + #include <mach/usb.h> ++#include <mach/control.h> #include "omap_udc.h" diff --git a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch b/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch index a0bb03e0739cc0..663d771495c105 100644 --- a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch +++ b/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch @@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK), --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c -@@ -57,7 +57,7 @@ static void at91_start_hc(struct platfor +@@ -56,7 +56,7 @@ static void at91_start_hc(struct platfor struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_regs __iomem *regs = hcd->regs; @@ -280,7 +280,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Start the USB clocks. -@@ -75,7 +75,7 @@ static void at91_stop_hc(struct platform +@@ -74,7 +74,7 @@ static void at91_stop_hc(struct platform struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_regs __iomem *regs = hcd->regs; @@ -329,7 +329,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c -@@ -333,7 +333,7 @@ static int __devinit usb_hcd_pnx4008_pro +@@ -332,7 +332,7 @@ static int __devinit usb_hcd_pnx4008_pro int ret = 0, irq; @@ -338,7 +338,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (usb_disabled()) { err("USB is disabled"); ret = -ENODEV; -@@ -400,7 +400,7 @@ static int __devinit usb_hcd_pnx4008_pro +@@ -399,7 +399,7 @@ static int __devinit usb_hcd_pnx4008_pro hcd->rsrc_start = pdev->resource[0].start; hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1; if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { @@ -1 +1 @@ -2.6.27-rc2 +2.6.27-rc3 |