diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/dmatest.c | 4 | ||||
-rw-r--r-- | drivers/firmware/iscsi_ibft.c | 4 | ||||
-rw-r--r-- | drivers/gpio/ab8500-gpio.c | 7 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 5 | ||||
-rw-r--r-- | drivers/message/fusion/mptbase.c | 22 | ||||
-rw-r--r-- | drivers/misc/bh1780gli.c | 8 | ||||
-rw-r--r-- | drivers/misc/spear13xx_pcie_gadget.c | 4 | ||||
-rw-r--r-- | drivers/net/atlx/atl1.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/airo.c | 27 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 | ||||
-rw-r--r-- | drivers/regulator/max8998.c | 4 | ||||
-rw-r--r-- | drivers/tty/serial/bfin_sport_uart.c | 3 | ||||
-rw-r--r-- | drivers/tty/serial/mfd.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 7 | ||||
-rw-r--r-- | drivers/usb/storage/ene_ub6250.c | 4 |
16 files changed, 58 insertions, 58 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index e0888cb538d4..8597ff269bfd 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -56,8 +56,8 @@ MODULE_PARM_DESC(pq_sources, | |||
56 | 56 | ||
57 | static int timeout = 3000; | 57 | static int timeout = 3000; |
58 | module_param(timeout, uint, S_IRUGO); | 58 | module_param(timeout, uint, S_IRUGO); |
59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), \ | 59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), " |
60 | Pass -1 for infinite timeout"); | 60 | "Pass -1 for infinite timeout"); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Initialization patterns. All bytes in the source buffer has bit 7 | 63 | * Initialization patterns. All bytes in the source buffer has bit 7 |
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 6148a1c67895..ce33f4626957 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -87,8 +87,8 @@ | |||
87 | #define IBFT_ISCSI_VERSION "0.5.0" | 87 | #define IBFT_ISCSI_VERSION "0.5.0" |
88 | #define IBFT_ISCSI_DATE "2010-Feb-25" | 88 | #define IBFT_ISCSI_DATE "2010-Feb-25" |
89 | 89 | ||
90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and \ | 90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and " |
91 | Konrad Rzeszutek <ketuzsezr@darnok.org>"); | 91 | "Konrad Rzeszutek <ketuzsezr@darnok.org>"); |
92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); | 92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); |
93 | MODULE_LICENSE("GPL"); | 93 | MODULE_LICENSE("GPL"); |
94 | MODULE_VERSION(IBFT_ISCSI_VERSION); | 94 | MODULE_VERSION(IBFT_ISCSI_VERSION); |
diff --git a/drivers/gpio/ab8500-gpio.c b/drivers/gpio/ab8500-gpio.c index e7b834d054b7..970053c89ff7 100644 --- a/drivers/gpio/ab8500-gpio.c +++ b/drivers/gpio/ab8500-gpio.c | |||
@@ -482,8 +482,8 @@ static int __devexit ab8500_gpio_remove(struct platform_device *pdev) | |||
482 | 482 | ||
483 | ret = gpiochip_remove(&ab8500_gpio->chip); | 483 | ret = gpiochip_remove(&ab8500_gpio->chip); |
484 | if (ret < 0) { | 484 | if (ret < 0) { |
485 | dev_err(ab8500_gpio->dev, "unable to remove gpiochip:\ | 485 | dev_err(ab8500_gpio->dev, "unable to remove gpiochip: %d\n", |
486 | %d\n", ret); | 486 | ret); |
487 | return ret; | 487 | return ret; |
488 | } | 488 | } |
489 | 489 | ||
@@ -516,7 +516,6 @@ static void __exit ab8500_gpio_exit(void) | |||
516 | module_exit(ab8500_gpio_exit); | 516 | module_exit(ab8500_gpio_exit); |
517 | 517 | ||
518 | MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>"); | 518 | MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>"); |
519 | MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins\ | 519 | MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins to be used as GPIO"); |
520 | to be used as GPIO"); | ||
521 | MODULE_ALIAS("AB8500 GPIO driver"); | 520 | MODULE_ALIAS("AB8500 GPIO driver"); |
522 | MODULE_LICENSE("GPL v2"); | 521 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 6083137f0bf8..9855fbe5927a 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -70,8 +70,9 @@ | |||
70 | #include "usbvision.h" | 70 | #include "usbvision.h" |
71 | #include "usbvision-cards.h" | 71 | #include "usbvision-cards.h" |
72 | 72 | ||
73 | #define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, \ | 73 | #define DRIVER_AUTHOR \ |
74 | Dwaine Garden <DwaineGarden@rogers.com>" | 74 | "Joerg Heckenbach <joerg@heckenbach-aw.de>, " \ |
75 | "Dwaine Garden <DwaineGarden@rogers.com>" | ||
75 | #define DRIVER_NAME "usbvision" | 76 | #define DRIVER_NAME "usbvision" |
76 | #define DRIVER_ALIAS "USBVision" | 77 | #define DRIVER_ALIAS "USBVision" |
77 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" | 78 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index fa15e853d4e8..7956a10f9488 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -83,19 +83,18 @@ MODULE_VERSION(my_VERSION); | |||
83 | 83 | ||
84 | static int mpt_msi_enable_spi; | 84 | static int mpt_msi_enable_spi; |
85 | module_param(mpt_msi_enable_spi, int, 0); | 85 | module_param(mpt_msi_enable_spi, int, 0); |
86 | MODULE_PARM_DESC(mpt_msi_enable_spi, " Enable MSI Support for SPI \ | 86 | MODULE_PARM_DESC(mpt_msi_enable_spi, |
87 | controllers (default=0)"); | 87 | " Enable MSI Support for SPI controllers (default=0)"); |
88 | 88 | ||
89 | static int mpt_msi_enable_fc; | 89 | static int mpt_msi_enable_fc; |
90 | module_param(mpt_msi_enable_fc, int, 0); | 90 | module_param(mpt_msi_enable_fc, int, 0); |
91 | MODULE_PARM_DESC(mpt_msi_enable_fc, " Enable MSI Support for FC \ | 91 | MODULE_PARM_DESC(mpt_msi_enable_fc, |
92 | controllers (default=0)"); | 92 | " Enable MSI Support for FC controllers (default=0)"); |
93 | 93 | ||
94 | static int mpt_msi_enable_sas; | 94 | static int mpt_msi_enable_sas; |
95 | module_param(mpt_msi_enable_sas, int, 0); | 95 | module_param(mpt_msi_enable_sas, int, 0); |
96 | MODULE_PARM_DESC(mpt_msi_enable_sas, " Enable MSI Support for SAS \ | 96 | MODULE_PARM_DESC(mpt_msi_enable_sas, |
97 | controllers (default=0)"); | 97 | " Enable MSI Support for SAS controllers (default=0)"); |
98 | |||
99 | 98 | ||
100 | static int mpt_channel_mapping; | 99 | static int mpt_channel_mapping; |
101 | module_param(mpt_channel_mapping, int, 0); | 100 | module_param(mpt_channel_mapping, int, 0); |
@@ -105,15 +104,14 @@ static int mpt_debug_level; | |||
105 | static int mpt_set_debug_level(const char *val, struct kernel_param *kp); | 104 | static int mpt_set_debug_level(const char *val, struct kernel_param *kp); |
106 | module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int, | 105 | module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int, |
107 | &mpt_debug_level, 0600); | 106 | &mpt_debug_level, 0600); |
108 | MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h \ | 107 | MODULE_PARM_DESC(mpt_debug_level, |
109 | - (default=0)"); | 108 | " debug level - refer to mptdebug.h - (default=0)"); |
110 | 109 | ||
111 | int mpt_fwfault_debug; | 110 | int mpt_fwfault_debug; |
112 | EXPORT_SYMBOL(mpt_fwfault_debug); | 111 | EXPORT_SYMBOL(mpt_fwfault_debug); |
113 | module_param(mpt_fwfault_debug, int, 0600); | 112 | module_param(mpt_fwfault_debug, int, 0600); |
114 | MODULE_PARM_DESC(mpt_fwfault_debug, "Enable detection of Firmware fault" | 113 | MODULE_PARM_DESC(mpt_fwfault_debug, |
115 | " and halt Firmware on fault - (default=0)"); | 114 | "Enable detection of Firmware fault and halt Firmware on fault - (default=0)"); |
116 | |||
117 | 115 | ||
118 | static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; | 116 | static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; |
119 | 117 | ||
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c index d07cd67c951c..82fe2d067827 100644 --- a/drivers/misc/bh1780gli.c +++ b/drivers/misc/bh1780gli.c | |||
@@ -49,8 +49,8 @@ static int bh1780_write(struct bh1780_data *ddata, u8 reg, u8 val, char *msg) | |||
49 | int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); | 49 | int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); |
50 | if (ret < 0) | 50 | if (ret < 0) |
51 | dev_err(&ddata->client->dev, | 51 | dev_err(&ddata->client->dev, |
52 | "i2c_smbus_write_byte_data failed error %d\ | 52 | "i2c_smbus_write_byte_data failed error %d Register (%s)\n", |
53 | Register (%s)\n", ret, msg); | 53 | ret, msg); |
54 | return ret; | 54 | return ret; |
55 | } | 55 | } |
56 | 56 | ||
@@ -59,8 +59,8 @@ static int bh1780_read(struct bh1780_data *ddata, u8 reg, char *msg) | |||
59 | int ret = i2c_smbus_read_byte_data(ddata->client, reg); | 59 | int ret = i2c_smbus_read_byte_data(ddata->client, reg); |
60 | if (ret < 0) | 60 | if (ret < 0) |
61 | dev_err(&ddata->client->dev, | 61 | dev_err(&ddata->client->dev, |
62 | "i2c_smbus_read_byte_data failed error %d\ | 62 | "i2c_smbus_read_byte_data failed error %d Register (%s)\n", |
63 | Register (%s)\n", ret, msg); | 63 | ret, msg); |
64 | return ret; | 64 | return ret; |
65 | } | 65 | } |
66 | 66 | ||
diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c index ec3b8c911833..7aded90f9daa 100644 --- a/drivers/misc/spear13xx_pcie_gadget.c +++ b/drivers/misc/spear13xx_pcie_gadget.c | |||
@@ -787,8 +787,8 @@ static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev) | |||
787 | 787 | ||
788 | status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL); | 788 | status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL); |
789 | if (status) { | 789 | if (status) { |
790 | dev_err(&pdev->dev, "pcie gadget interrupt IRQ%d already \ | 790 | dev_err(&pdev->dev, |
791 | claimed\n", irq); | 791 | "pcie gadget interrupt IRQ%d already claimed\n", irq); |
792 | goto err_iounmap; | 792 | goto err_iounmap; |
793 | } | 793 | } |
794 | 794 | ||
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 67f40b9c16ed..d9951bbc7212 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -83,8 +83,9 @@ | |||
83 | #include "atl1.h" | 83 | #include "atl1.h" |
84 | 84 | ||
85 | #define ATLX_DRIVER_VERSION "2.1.3" | 85 | #define ATLX_DRIVER_VERSION "2.1.3" |
86 | MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \ | 86 | MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, " |
87 | Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>"); | 87 | "Chris Snook <csnook@redhat.com>, " |
88 | "Jay Cliburn <jcliburn@gmail.com>"); | ||
88 | MODULE_LICENSE("GPL"); | 89 | MODULE_LICENSE("GPL"); |
89 | MODULE_VERSION(ATLX_DRIVER_VERSION); | 90 | MODULE_VERSION(ATLX_DRIVER_VERSION); |
90 | 91 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 4e5c7a11f04a..a70c512f05d2 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -242,9 +242,8 @@ static int airo_perm = 0555; | |||
242 | static int proc_perm = 0644; | 242 | static int proc_perm = 0644; |
243 | 243 | ||
244 | MODULE_AUTHOR("Benjamin Reed"); | 244 | MODULE_AUTHOR("Benjamin Reed"); |
245 | MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet \ | 245 | MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. " |
246 | cards. Direct support for ISA/PCI/MPI cards and support \ | 246 | "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs."); |
247 | for PCMCIA when used with airo_cs."); | ||
248 | MODULE_LICENSE("Dual BSD/GPL"); | 247 | MODULE_LICENSE("Dual BSD/GPL"); |
249 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); | 248 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); |
250 | module_param_array(io, int, NULL, 0); | 249 | module_param_array(io, int, NULL, 0); |
@@ -252,18 +251,20 @@ module_param_array(irq, int, NULL, 0); | |||
252 | module_param_array(rates, int, NULL, 0); | 251 | module_param_array(rates, int, NULL, 0); |
253 | module_param_array(ssids, charp, NULL, 0); | 252 | module_param_array(ssids, charp, NULL, 0); |
254 | module_param(auto_wep, int, 0); | 253 | module_param(auto_wep, int, 0); |
255 | MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \ | 254 | MODULE_PARM_DESC(auto_wep, |
256 | the authentication options until an association is made. The value of \ | 255 | "If non-zero, the driver will keep looping through the authentication options until an association is made. " |
257 | auto_wep is number of the wep keys to check. A value of 2 will try using \ | 256 | "The value of auto_wep is number of the wep keys to check. " |
258 | the key at index 0 and index 1."); | 257 | "A value of 2 will try using the key at index 0 and index 1."); |
259 | module_param(aux_bap, int, 0); | 258 | module_param(aux_bap, int, 0); |
260 | MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \ | 259 | MODULE_PARM_DESC(aux_bap, |
261 | than seems to work better for older cards with some older buses. Before \ | 260 | "If non-zero, the driver will switch into a mode that seems to work better for older cards with some older buses. " |
262 | switching it checks that the switch is needed."); | 261 | "Before switching it checks that the switch is needed."); |
263 | module_param(maxencrypt, int, 0); | 262 | module_param(maxencrypt, int, 0); |
264 | MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \ | 263 | MODULE_PARM_DESC(maxencrypt, |
265 | encryption. Units are in 512kbs. Zero (default) means there is no limit. \ | 264 | "The maximum speed that the card can do encryption. " |
266 | Older cards used to be limited to 2mbs (4)."); | 265 | "Units are in 512kbs. " |
266 | "Zero (default) means there is no limit. " | ||
267 | "Older cards used to be limited to 2mbs (4)."); | ||
267 | module_param(adhoc, int, 0); | 268 | module_param(adhoc, int, 0); |
268 | MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); | 269 | MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); |
269 | module_param(probe, int, 0); | 270 | module_param(probe, int, 0); |
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c b/drivers/net/wireless/iwlegacy/iwl-4965-calib.c index 81d6a25eb04f..162d877e6869 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-calib.c | |||
@@ -713,8 +713,8 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, | |||
713 | iwl4965_find_first_chain(priv->cfg->valid_tx_ant); | 713 | iwl4965_find_first_chain(priv->cfg->valid_tx_ant); |
714 | data->disconn_array[first_chain] = 0; | 714 | data->disconn_array[first_chain] = 0; |
715 | active_chains |= BIT(first_chain); | 715 | active_chains |= BIT(first_chain); |
716 | IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected \ | 716 | IWL_DEBUG_CALIB(priv, |
717 | W/A - declare %d as connected\n", | 717 | "All Tx chains are disconnected W/A - declare %d as connected\n", |
718 | first_chain); | 718 | first_chain); |
719 | break; | 719 | break; |
720 | } | 720 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c index 9006293e740c..f35ac8ccd52d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c | |||
@@ -824,8 +824,8 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, | |||
824 | find_first_chain(priv->cfg->valid_tx_ant); | 824 | find_first_chain(priv->cfg->valid_tx_ant); |
825 | data->disconn_array[first_chain] = 0; | 825 | data->disconn_array[first_chain] = 0; |
826 | active_chains |= BIT(first_chain); | 826 | active_chains |= BIT(first_chain); |
827 | IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected \ | 827 | IWL_DEBUG_CALIB(priv, |
828 | W/A - declare %d as connected\n", | 828 | "All Tx chains are disconnected W/A - declare %d as connected\n", |
829 | first_chain); | 829 | first_chain); |
830 | break; | 830 | break; |
831 | } | 831 | } |
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index 43410266f993..f57e9c42fdb4 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c | |||
@@ -405,8 +405,8 @@ static int max8998_set_voltage_buck(struct regulator_dev *rdev, | |||
405 | switch (buck) { | 405 | switch (buck) { |
406 | case MAX8998_BUCK1: | 406 | case MAX8998_BUCK1: |
407 | dev_dbg(max8998->dev, | 407 | dev_dbg(max8998->dev, |
408 | "BUCK1, i:%d, buck1_vol1:%d, buck1_vol2:%d\n\ | 408 | "BUCK1, i:%d, buck1_vol1:%d, buck1_vol2:%d\n" |
409 | buck1_vol3:%d, buck1_vol4:%d\n", | 409 | "buck1_vol3:%d, buck1_vol4:%d\n", |
410 | i, max8998->buck1_vol[0], max8998->buck1_vol[1], | 410 | i, max8998->buck1_vol[0], max8998->buck1_vol[1], |
411 | max8998->buck1_vol[2], max8998->buck1_vol[3]); | 411 | max8998->buck1_vol[2], max8998->buck1_vol[3]); |
412 | 412 | ||
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c index c3ec0a61d859..891d194ae754 100644 --- a/drivers/tty/serial/bfin_sport_uart.c +++ b/drivers/tty/serial/bfin_sport_uart.c | |||
@@ -296,8 +296,7 @@ static int sport_startup(struct uart_port *port) | |||
296 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | 296 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | |
297 | IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) { | 297 | IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) { |
298 | up->cts_pin = -1; | 298 | up->cts_pin = -1; |
299 | dev_info(port->dev, "Unable to attach BlackFin UART \ | 299 | dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n"); |
300 | over SPORT CTS interrupt. So, disable it.\n"); | ||
301 | } | 300 | } |
302 | } | 301 | } |
303 | if (up->rts_pin >= 0) | 302 | if (up->rts_pin >= 0) |
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c index c111f36f5d21..cab52f4a88b0 100644 --- a/drivers/tty/serial/mfd.c +++ b/drivers/tty/serial/mfd.c | |||
@@ -49,8 +49,8 @@ | |||
49 | 49 | ||
50 | static int hsu_dma_enable; | 50 | static int hsu_dma_enable; |
51 | module_param(hsu_dma_enable, int, 0); | 51 | module_param(hsu_dma_enable, int, 0); |
52 | MODULE_PARM_DESC(hsu_dma_enable, "It is a bitmap to set working mode, if \ | 52 | MODULE_PARM_DESC(hsu_dma_enable, |
53 | bit[x] is 1, then port[x] will work in DMA mode, otherwise in PIO mode."); | 53 | "It is a bitmap to set working mode, if bit[x] is 1, then port[x] will work in DMA mode, otherwise in PIO mode."); |
54 | 54 | ||
55 | struct hsu_dma_buffer { | 55 | struct hsu_dma_buffer { |
56 | u8 *buf; | 56 | u8 *buf; |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 4f65b14e5e08..448b9d1f0e70 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -53,9 +53,10 @@ | |||
53 | /* | 53 | /* |
54 | * Version Information | 54 | * Version Information |
55 | */ | 55 | */ |
56 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ | 56 | #define DRIVER_AUTHOR \ |
57 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ | 57 | "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, " \ |
58 | Alan Stern" | 58 | "Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, " \ |
59 | "Roman Weissgaerber, Alan Stern" | ||
59 | #define DRIVER_DESC "USB Universal Host Controller Interface driver" | 60 | #define DRIVER_DESC "USB Universal Host Controller Interface driver" |
60 | 61 | ||
61 | /* for flakey hardware, ignore overcurrent indicators */ | 62 | /* for flakey hardware, ignore overcurrent indicators */ |
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index 0e5aafda4537..31645afff5fc 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c | |||
@@ -715,8 +715,8 @@ static int ene_ub6250_probe(struct usb_interface *intf, | |||
715 | 715 | ||
716 | if (!(misc_reg03 & 0x01)) { | 716 | if (!(misc_reg03 & 0x01)) { |
717 | result = -ENODEV; | 717 | result = -ENODEV; |
718 | printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD\ | 718 | printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD card. " |
719 | card. To use SM/MS card, please build driver/stagging/keucr\n"); | 719 | "To use SM/MS card, please build driver/staging/keucr\n"); |
720 | usb_stor_disconnect(intf); | 720 | usb_stor_disconnect(intf); |
721 | } | 721 | } |
722 | 722 | ||