diff options
9 files changed, 21 insertions, 21 deletions
diff --git a/driver-core/devtmpfs-support-config_tmpfs.patch b/driver-core/devtmpfs-support-config_tmpfs.patch index df32af5c484025..099c51776a0138 100644 --- a/driver-core/devtmpfs-support-config_tmpfs.patch +++ b/driver-core/devtmpfs-support-config_tmpfs.patch @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <linux/cred.h> #include <linux/sched.h> #include <linux/init_task.h> -@@ -44,7 +45,11 @@ __setup("devtmpfs.mount=", mount_param); +@@ -45,7 +46,11 @@ __setup("devtmpfs.mount=", mount_param); static int dev_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct file_system_type dev_fs_type = { --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c -@@ -213,7 +213,7 @@ static int ramfs_parse_options(char *dat +@@ -214,7 +214,7 @@ static int ramfs_parse_options(char *dat return 0; } diff --git a/driver-core/driver-core-module.c-use-kasprintf.patch b/driver-core/driver-core-module.c-use-kasprintf.patch index 1da2c53e37d88a..1d9c34b56657cf 100644 --- a/driver-core/driver-core-module.c-use-kasprintf.patch +++ b/driver-core/driver-core-module.c-use-kasprintf.patch @@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/base/module.c +++ b/drivers/base/module.c -@@ -14,12 +14,10 @@ static char *make_driver_name(struct dev +@@ -15,12 +15,10 @@ static char *make_driver_name(struct dev { char *driver_name; diff --git a/driver-core/driver-core-reduce-the-level-of-request_firmware-messages.patch b/driver-core/driver-core-reduce-the-level-of-request_firmware-messages.patch index 20352d3c905eb6..477915026fb947 100644 --- a/driver-core/driver-core-reduce-the-level-of-request_firmware-messages.patch +++ b/driver-core/driver-core-reduce-the-level-of-request_firmware-messages.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c -@@ -492,15 +492,14 @@ _request_firmware(const struct firmware +@@ -493,15 +493,14 @@ _request_firmware(const struct firmware builtin++) { if (strcmp(name, builtin->name)) continue; diff --git a/usb/usb-musb-allow-the-blackfin-vrsel-gpio-to-be-active-low.patch b/usb/usb-musb-allow-the-blackfin-vrsel-gpio-to-be-active-low.patch index 846bb1bfe0faa2..40e3b327433a47 100644 --- a/usb/usb-musb-allow-the-blackfin-vrsel-gpio-to-be-active-low.patch +++ b/usb/usb-musb-allow-the-blackfin-vrsel-gpio-to-be-active-low.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c -@@ -245,10 +245,10 @@ static void bfin_vbus_power(struct musb +@@ -244,10 +244,10 @@ static void bfin_vbus_power(struct musb static void bfin_set_vbus(struct musb *musb, int is_on) { diff --git a/usb/usb-musb-set-transceiver-interface-type.patch b/usb/usb-musb-set-transceiver-interface-type.patch index 762d13718661ed..7991bf65b375c8 100644 --- a/usb/usb-musb-set-transceiver-interface-type.patch +++ b/usb/usb-musb-set-transceiver-interface-type.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c -@@ -277,7 +277,7 @@ int musb_platform_set_mode(struct musb * +@@ -276,7 +276,7 @@ int musb_platform_set_mode(struct musb * return -EIO; } @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c -@@ -377,7 +377,7 @@ int musb_platform_set_mode(struct musb * +@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb * return -EIO; } @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* __MUSB_CORE_H__ */ --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c -@@ -200,9 +200,10 @@ int musb_platform_set_mode(struct musb * +@@ -199,9 +199,10 @@ int musb_platform_set_mode(struct musb * return 0; } @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #if defined(CONFIG_ARCH_OMAP2430) omap_cfg_reg(AE5_2430_USB0HS_STP); -@@ -236,7 +237,15 @@ int __init musb_platform_init(struct mus +@@ -235,7 +236,15 @@ int __init musb_platform_init(struct mus musb_writel(musb->mregs, OTG_SYSCONFIG, l); l = musb_readl(musb->mregs, OTG_INTERFSEL); diff --git a/usb/usb-remove-bogus-usb_port_feat_-_speed-symbols.patch b/usb/usb-remove-bogus-usb_port_feat_-_speed-symbols.patch index ec47310783b9f8..f2b013ec2bf74c 100644 --- a/usb/usb-remove-bogus-usb_port_feat_-_speed-symbols.patch +++ b/usb/usb-remove-bogus-usb_port_feat_-_speed-symbols.patch @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c -@@ -1058,12 +1058,11 @@ static void r8a66597_usb_connect(struct +@@ -1059,12 +1059,11 @@ static void r8a66597_usb_connect(struct u16 speed = get_rh_usb_speed(r8a66597, port); struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; diff --git a/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch b/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch index 96ebdbe2c9a02a..95d97f81c7c90b 100644 --- a/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch +++ b/usb/usb-remove-uses-of-urb_no_setup_dma_map.patch @@ -394,7 +394,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* mutual exclusion and synchronization structures */ --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c -@@ -473,8 +473,6 @@ static void __wa_xfer_setup_hdr0(struct +@@ -474,8 +474,6 @@ static void __wa_xfer_setup_hdr0(struct struct wa_xfer_ctl *xfer_ctl = container_of(xfer_hdr0, struct wa_xfer_ctl, hdr); xfer_ctl->bmAttribute = xfer->is_inbound ? 1 : 0; diff --git a/usb/usb-straighten-out-port-feature-vs.-port-status-usage.patch b/usb/usb-straighten-out-port-feature-vs.-port-status-usage.patch index e2576d55169f5d..b0cdd3b0a7aa51 100644 --- a/usb/usb-straighten-out-port-feature-vs.-port-status-usage.patch +++ b/usb/usb-straighten-out-port-feature-vs.-port-status-usage.patch @@ -265,7 +265,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (status & ~0xffff) /* only if wPortChange is interesting */ --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c -@@ -1017,10 +1017,10 @@ static void start_root_hub_sampling(stru +@@ -1018,10 +1018,10 @@ static void start_root_hub_sampling(stru rh->old_syssts = r8a66597_read(r8a66597, get_syssts_reg(port)) & LNST; rh->scount = R8A66597_MAX_SAMPLING; if (connect) @@ -279,7 +279,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> r8a66597_root_hub_start_polling(r8a66597); } -@@ -1064,8 +1064,8 @@ static void r8a66597_usb_connect(struct +@@ -1065,8 +1065,8 @@ static void r8a66597_usb_connect(struct else if (speed == LSMODE) rh->port |= USB_PORT_STAT_LOW_SPEED; @@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* this function must be called with interrupt disabled */ -@@ -1704,7 +1704,7 @@ static void r8a66597_root_hub_control(st +@@ -1705,7 +1705,7 @@ static void r8a66597_root_hub_control(st u16 tmp; struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; @@ -299,7 +299,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unsigned long dvstctr_reg = get_dvstctr_reg(port); tmp = r8a66597_read(r8a66597, dvstctr_reg); -@@ -1716,7 +1716,7 @@ static void r8a66597_root_hub_control(st +@@ -1717,7 +1717,7 @@ static void r8a66597_root_hub_control(st r8a66597_usb_connect(r8a66597, port); } @@ -308,7 +308,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> r8a66597_write(r8a66597, ~ATTCH, get_intsts_reg(port)); r8a66597_bset(r8a66597, ATTCHE, get_intenb_reg(port)); } -@@ -2184,7 +2184,7 @@ static int r8a66597_hub_control(struct u +@@ -2185,7 +2185,7 @@ static int r8a66597_hub_control(struct u switch (wValue) { case USB_PORT_FEAT_ENABLE: @@ -317,7 +317,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; case USB_PORT_FEAT_SUSPEND: break; -@@ -2225,12 +2225,12 @@ static int r8a66597_hub_control(struct u +@@ -2226,12 +2226,12 @@ static int r8a66597_hub_control(struct u break; case USB_PORT_FEAT_POWER: r8a66597_port_power(r8a66597, port, 1); @@ -332,7 +332,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> disable_r8a66597_pipe_all(r8a66597, dev); free_usb_address(r8a66597, dev, 1); -@@ -2268,12 +2268,12 @@ static int r8a66597_bus_suspend(struct u +@@ -2269,12 +2269,12 @@ static int r8a66597_bus_suspend(struct u struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; unsigned long dvstctr_reg = get_dvstctr_reg(port); @@ -347,7 +347,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (rh->dev->udev->do_remote_wakeup) { msleep(3); /* waiting last SOF */ -@@ -2299,12 +2299,12 @@ static int r8a66597_bus_resume(struct us +@@ -2300,12 +2300,12 @@ static int r8a66597_bus_resume(struct us struct r8a66597_root_hub *rh = &r8a66597->root_hub[port]; unsigned long dvstctr_reg = get_dvstctr_reg(port); @@ -593,7 +593,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> default: --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c -@@ -184,8 +184,8 @@ static void musb_port_reset(struct musb +@@ -183,8 +183,8 @@ static void musb_port_reset(struct musb void musb_root_disconnect(struct musb *musb) { @@ -1 +1 @@ -2.6.34-rc2 +2.6.34-rc4 |