diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /drivers | |
parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'drivers')
174 files changed, 201 insertions, 312 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index ec2c777fcdb0..7aed5c792597 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -1588,7 +1588,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev) | |||
1588 | host->ports[0]->ioaddr.ctl_addr = (void *)res->start; | 1588 | host->ports[0]->ioaddr.ctl_addr = (void *)res->start; |
1589 | 1589 | ||
1590 | if (peripheral_request_list(atapi_io_port, "atapi-io-port")) { | 1590 | if (peripheral_request_list(atapi_io_port, "atapi-io-port")) { |
1591 | dev_err(&pdev->dev, "Requesting Peripherals faild\n"); | 1591 | dev_err(&pdev->dev, "Requesting Peripherals failed\n"); |
1592 | return -EFAULT; | 1592 | return -EFAULT; |
1593 | } | 1593 | } |
1594 | 1594 | ||
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index bf88f71a21f4..aa0e0c51cc08 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -15,8 +15,8 @@ | |||
15 | * May be copied or modified under the terms of the GNU General Public License | 15 | * May be copied or modified under the terms of the GNU General Public License |
16 | * Based in part on the ITE vendor provided SCSI driver. | 16 | * Based in part on the ITE vendor provided SCSI driver. |
17 | * | 17 | * |
18 | * Documentation available from | 18 | * Documentation available from IT8212F_V04.pdf |
19 | * http://www.ite.com.tw/pc/IT8212F_V04.pdf | 19 | * http://www.ite.com.tw/EN/products_more.aspx?CategoryID=3&ID=5,91 |
20 | * Some other documents are NDA. | 20 | * Some other documents are NDA. |
21 | * | 21 | * |
22 | * The ITE8212 isn't exactly a standard IDE controller. It has two | 22 | * The ITE8212 isn't exactly a standard IDE controller. It has two |
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig index be7461c9a87e..31c60101a69a 100644 --- a/drivers/atm/Kconfig +++ b/drivers/atm/Kconfig | |||
@@ -301,7 +301,7 @@ config ATM_IA | |||
301 | control memory (128K-1KVC, 512K-4KVC), the size of the packet | 301 | control memory (128K-1KVC, 512K-4KVC), the size of the packet |
302 | memory (128K, 512K, 1M), and the PHY type (Single/Multi mode OC3, | 302 | memory (128K, 512K, 1M), and the PHY type (Single/Multi mode OC3, |
303 | UTP155, UTP25, DS3 and E3). Go to: | 303 | UTP155, UTP25, DS3 and E3). Go to: |
304 | <http://www.iphase.com/products/ClassSheet.cfm?ClassID=ATM> | 304 | <http://www.iphase.com/> |
305 | for more info about the cards. Say Y (or M to compile as a module | 305 | for more info about the cards. Say Y (or M to compile as a module |
306 | named iphase) here if you have one of these cards. | 306 | named iphase) here if you have one of these cards. |
307 | 307 | ||
diff --git a/drivers/base/core.c b/drivers/base/core.c index 2cb49a93b1e6..6ed645411c40 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -233,7 +233,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, | |||
233 | __func__, retval); | 233 | __func__, retval); |
234 | } | 234 | } |
235 | 235 | ||
236 | /* have the device type specific fuction add its stuff */ | 236 | /* have the device type specific function add its stuff */ |
237 | if (dev->type && dev->type->uevent) { | 237 | if (dev->type && dev->type->uevent) { |
238 | retval = dev->type->uevent(dev, env); | 238 | retval = dev->type->uevent(dev, env); |
239 | if (retval) | 239 | if (retval) |
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index 5ddf67e76f8b..fcd867d923ba 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
@@ -34,7 +34,7 @@ config AGP_ALI | |||
34 | X on the following ALi chipsets. The supported chipsets | 34 | X on the following ALi chipsets. The supported chipsets |
35 | include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. | 35 | include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. |
36 | For the ALi-chipset question, ALi suggests you refer to | 36 | For the ALi-chipset question, ALi suggests you refer to |
37 | <http://www.ali.com.tw/eng/support/index.shtml>. | 37 | <http://www.ali.com.tw/>. |
38 | 38 | ||
39 | The M1541 chipset can do AGP 1x and 2x, but note that there is an | 39 | The M1541 chipset can do AGP 1x and 2x, but note that there is an |
40 | acknowledged incompatibility with Matrox G200 cards. Due to | 40 | acknowledged incompatibility with Matrox G200 cards. Due to |
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index e763d3312ce7..75b763cb3ea1 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of | 2 | * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of |
3 | * the "Intel 460GTX Chipset Software Developer's Manual": | 3 | * the "Intel 460GTX Chipset Software Developer's Manual": |
4 | * http://developer.intel.com/design/itanium/downloads/24870401s.htm | 4 | * http://www.intel.com/design/archives/itanium/downloads/248704.htm |
5 | */ | 5 | */ |
6 | /* | 6 | /* |
7 | * 460GX support by Chris Ahna <christopher.j.ahna@intel.com> | 7 | * 460GX support by Chris Ahna <christopher.j.ahna@intel.com> |
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c index 3022801669b1..45b987c9889e 100644 --- a/drivers/char/apm-emulation.c +++ b/drivers/char/apm-emulation.c | |||
@@ -7,8 +7,8 @@ | |||
7 | * Intel Corporation, Microsoft Corporation. Advanced Power Management | 7 | * Intel Corporation, Microsoft Corporation. Advanced Power Management |
8 | * (APM) BIOS Interface Specification, Revision 1.2, February 1996. | 8 | * (APM) BIOS Interface Specification, Revision 1.2, February 1996. |
9 | * | 9 | * |
10 | * [This document is available from Microsoft at: | 10 | * This document is available from Microsoft at: |
11 | * http://www.microsoft.com/hwdev/busbios/amp_12.htm] | 11 | * http://www.microsoft.com/whdc/archive/amp_12.mspx |
12 | */ | 12 | */ |
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/poll.h> | 14 | #include <linux/poll.h> |
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index 7b98c067190a..3ed20e8abc0d 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * ipmi_bt_sm.c | 2 | * ipmi_bt_sm.c |
3 | * | 3 | * |
4 | * The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part | 4 | * The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part |
5 | * of the driver architecture at http://sourceforge.net/project/openipmi | 5 | * of the driver architecture at http://sourceforge.net/projects/openipmi |
6 | * | 6 | * |
7 | * Author: Rocky Craig <first.last@hp.com> | 7 | * Author: Rocky Craig <first.last@hp.com> |
8 | * | 8 | * |
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 7bd7c45b53ef..e537610d2f09 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -1974,8 +1974,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info) | |||
1974 | 1974 | ||
1975 | /* | 1975 | /* |
1976 | * Defined at | 1976 | * Defined at |
1977 | * http://h21007.www2.hp.com/portal/download/files | 1977 | * http://h21007.www2.hp.com/portal/download/files/unprot/hpspmi.pdf |
1978 | * /unprot/hpspmi.pdf | ||
1979 | */ | 1978 | */ |
1980 | struct SPMITable { | 1979 | struct SPMITable { |
1981 | s8 Signature[4]; | 1980 | s8 Signature[4]; |
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c index a98290d7a2c5..88dda0c45ee0 100644 --- a/drivers/char/n_r3964.c +++ b/drivers/char/n_r3964.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * Copyright by | 4 | * Copyright by |
5 | * Philips Automation Projects | 5 | * Philips Automation Projects |
6 | * Kassel (Germany) | 6 | * Kassel (Germany) |
7 | * http://www.pap-philips.de | ||
8 | * ----------------------------------------------------------- | 7 | * ----------------------------------------------------------- |
9 | * This software may be used and distributed according to the terms of | 8 | * This software may be used and distributed according to the terms of |
10 | * the GNU General Public License, incorporated herein by reference. | 9 | * the GNU General Public License, incorporated herein by reference. |
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig index ffa0efce0aed..6614416a8623 100644 --- a/drivers/char/pcmcia/Kconfig +++ b/drivers/char/pcmcia/Kconfig | |||
@@ -28,7 +28,7 @@ config CARDMAN_4000 | |||
28 | 28 | ||
29 | This kernel driver requires additional userspace support, either | 29 | This kernel driver requires additional userspace support, either |
30 | by the vendor-provided PC/SC ifd_handler (http://www.omnikey.com/), | 30 | by the vendor-provided PC/SC ifd_handler (http://www.omnikey.com/), |
31 | or via the cm4000 backend of OpenCT (http://www.opensc.com/). | 31 | or via the cm4000 backend of OpenCT (http://www.opensc-project.org/opensc). |
32 | 32 | ||
33 | config CARDMAN_4040 | 33 | config CARDMAN_4040 |
34 | tristate "Omnikey CardMan 4040 support" | 34 | tristate "Omnikey CardMan 4040 support" |
@@ -41,7 +41,7 @@ config CARDMAN_4040 | |||
41 | in I/O space. To use the kernel driver, you will need either the | 41 | in I/O space. To use the kernel driver, you will need either the |
42 | PC/SC ifdhandler provided from the Omnikey homepage | 42 | PC/SC ifdhandler provided from the Omnikey homepage |
43 | (http://www.omnikey.com/), or a current development version of OpenCT | 43 | (http://www.omnikey.com/), or a current development version of OpenCT |
44 | (http://www.opensc.org/). | 44 | (http://www.opensc-project.org/opensc). |
45 | 45 | ||
46 | config IPWIRELESS | 46 | config IPWIRELESS |
47 | tristate "IPWireless 3G UMTS PCMCIA card support" | 47 | tristate "IPWireless 3G UMTS PCMCIA card support" |
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 6835c23e9a51..d962f25dcc2a 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1666,7 +1666,7 @@ static int cmm_open(struct inode *inode, struct file *filp) | |||
1666 | /* opening will always block since the | 1666 | /* opening will always block since the |
1667 | * monitor will be started by open, which | 1667 | * monitor will be started by open, which |
1668 | * means we have to wait for ATR becoming | 1668 | * means we have to wait for ATR becoming |
1669 | * vaild = block until valid (or card | 1669 | * valid = block until valid (or card |
1670 | * inserted) | 1670 | * inserted) |
1671 | */ | 1671 | */ |
1672 | if (filp->f_flags & O_NONBLOCK) { | 1672 | if (filp->f_flags & O_NONBLOCK) { |
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 8ef16490810c..4bef6ab83622 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
@@ -3181,7 +3181,7 @@ static void stl_cd1400flush(struct stlport *portp) | |||
3181 | 3181 | ||
3182 | /* | 3182 | /* |
3183 | * Return the current state of data flow on this port. This is only | 3183 | * Return the current state of data flow on this port. This is only |
3184 | * really interresting when determining if data has fully completed | 3184 | * really interesting when determining if data has fully completed |
3185 | * transmission or not... This is easy for the cd1400, it accurately | 3185 | * transmission or not... This is easy for the cd1400, it accurately |
3186 | * maintains the busy port flag. | 3186 | * maintains the busy port flag. |
3187 | */ | 3187 | */ |
@@ -4131,7 +4131,7 @@ static void stl_sc26198flush(struct stlport *portp) | |||
4131 | 4131 | ||
4132 | /* | 4132 | /* |
4133 | * Return the current state of data flow on this port. This is only | 4133 | * Return the current state of data flow on this port. This is only |
4134 | * really interresting when determining if data has fully completed | 4134 | * really interesting when determining if data has fully completed |
4135 | * transmission or not... The sc26198 interrupt scheme cannot | 4135 | * transmission or not... The sc26198 interrupt scheme cannot |
4136 | * determine when all data has actually drained, so we need to | 4136 | * determine when all data has actually drained, so we need to |
4137 | * check the port statusy register to be sure. | 4137 | * check the port statusy register to be sure. |
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 4dc338f3d1aa..f6595aba4f0f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
@@ -58,6 +58,6 @@ config TCG_INFINEON | |||
58 | To compile this driver as a module, choose M here; the module | 58 | To compile this driver as a module, choose M here; the module |
59 | will be called tpm_infineon. | 59 | will be called tpm_infineon. |
60 | Further information on this driver and the supported hardware | 60 | Further information on this driver and the supported hardware |
61 | can be found at http://www.prosec.rub.de/tpm | 61 | can be found at http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ |
62 | 62 | ||
63 | endif # TCG_TPM | 63 | endif # TCG_TPM |
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index f58440791e65..76da32e11f18 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> | 7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> |
8 | * Sirrix AG - security technologies, http://www.sirrix.com and | 8 | * Sirrix AG - security technologies, http://www.sirrix.com and |
9 | * Applied Data Security Group, Ruhr-University Bochum, Germany | 9 | * Applied Data Security Group, Ruhr-University Bochum, Germany |
10 | * Project-Homepage: http://www.prosec.rub.de/tpm | 10 | * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU General Public License as | 13 | * modify it under the terms of the GNU General Public License as |
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c index 2941dca91aae..400de071cabc 100644 --- a/drivers/edac/edac_device_sysfs.c +++ b/drivers/edac/edac_device_sysfs.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * file for managing the edac_device class of devices for EDAC | 2 | * file for managing the edac_device class of devices for EDAC |
3 | * | 3 | * |
4 | * (C) 2007 SoftwareBitMaker (http://www.softwarebitmaker.com) | 4 | * (C) 2007 SoftwareBitMaker |
5 | * | 5 | * |
6 | * This file may be distributed under the terms of the | 6 | * This file may be distributed under the terms of the |
7 | * GNU General Public License. | 7 | * GNU General Public License. |
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c index a2fa1feed724..678405ab04e4 100644 --- a/drivers/edac/i82443bxgx_edac.c +++ b/drivers/edac/i82443bxgx_edac.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * 440GX fix by Jason Uhlenkott <juhlenko@akamai.com>. | 12 | * 440GX fix by Jason Uhlenkott <juhlenko@akamai.com>. |
13 | * | 13 | * |
14 | * Written with reference to 82443BX Host Bridge Datasheet: | 14 | * Written with reference to 82443BX Host Bridge Datasheet: |
15 | * http://www.intel.com/design/chipsets/440/documentation.htm | 15 | * http://download.intel.com/design/chipsets/datashts/29063301.pdf |
16 | * references to this document given in []. | 16 | * references to this document given in []. |
17 | * | 17 | * |
18 | * This module doesn't support the 440LX, but it may be possible to | 18 | * This module doesn't support the 440LX, but it may be possible to |
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 88a3ae6cd023..e8b6a13515bd 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
@@ -74,7 +74,8 @@ config EFI_PCDP | |||
74 | 74 | ||
75 | You must also enable the appropriate drivers (serial, VGA, etc.) | 75 | You must also enable the appropriate drivers (serial, VGA, etc.) |
76 | 76 | ||
77 | See <http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf> | 77 | See DIG64_HCDPv20_042804.pdf available from |
78 | <http://www.dig64.org/specifications/> | ||
78 | 79 | ||
79 | config DELL_RBU | 80 | config DELL_RBU |
80 | tristate "BIOS update support for DELL systems via sysfs" | 81 | tristate "BIOS update support for DELL systems via sysfs" |
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index f287fe79edc4..96c25d93eed1 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * made in setup.S, copied to safe structures in setup.c, | 15 | * made in setup.S, copied to safe structures in setup.c, |
16 | * and presents it in sysfs. | 16 | * and presents it in sysfs. |
17 | * | 17 | * |
18 | * Please see http://linux.dell.com/edd30/results.html for | 18 | * Please see http://linux.dell.com/edd/results.html for |
19 | * the list of BIOSs which have been reported to implement EDD. | 19 | * the list of BIOSs which have been reported to implement EDD. |
20 | * | 20 | * |
21 | * This program is free software; you can redistribute it and/or modify | 21 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h index ce910d68bd19..e5530608e00d 100644 --- a/drivers/firmware/pcdp.h +++ b/drivers/firmware/pcdp.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Definitions for PCDP-defined console devices | 2 | * Definitions for PCDP-defined console devices |
3 | * | 3 | * |
4 | * v1.0a: http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf | 4 | * For DIG64_HCDPv10a_01.pdf and DIG64_PCDPv20.pdf (v1.0a and v2.0 resp.), |
5 | * v2.0: http://www.dig64.org/specifications/DIG64_PCDPv20.pdf | 5 | * please see <http://www.dig64.org/specifications/> |
6 | * | 6 | * |
7 | * (c) Copyright 2002, 2004 Hewlett-Packard Development Company, L.P. | 7 | * (c) Copyright 2002, 2004 Hewlett-Packard Development Company, L.P. |
8 | * Khalid Aziz <khalid.aziz@hp.com> | 8 | * Khalid Aziz <khalid.aziz@hp.com> |
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 949326d2a8e5..58e65f92c232 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -76,7 +76,7 @@ EXPORT_SYMBOL(drm_mode_debug_printmodeline); | |||
76 | * according to the hdisplay, vdisplay, vrefresh. | 76 | * according to the hdisplay, vdisplay, vrefresh. |
77 | * It is based from the VESA(TM) Coordinated Video Timing Generator by | 77 | * It is based from the VESA(TM) Coordinated Video Timing Generator by |
78 | * Graham Loveridge April 9, 2003 available at | 78 | * Graham Loveridge April 9, 2003 available at |
79 | * http://www.vesa.org/public/CVT/CVTd6r1.xls | 79 | * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls |
80 | * | 80 | * |
81 | * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c. | 81 | * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c. |
82 | * What I have done is to translate it by using integer calculation. | 82 | * What I have done is to translate it by using integer calculation. |
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index fcc79b5d22d1..6d64a2705f12 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
@@ -268,7 +268,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) | |||
268 | } | 268 | } |
269 | r = radeon_ib_schedule(rdev, parser.ib); | 269 | r = radeon_ib_schedule(rdev, parser.ib); |
270 | if (r) { | 270 | if (r) { |
271 | DRM_ERROR("Faild to schedule IB !\n"); | 271 | DRM_ERROR("Failed to schedule IB !\n"); |
272 | } | 272 | } |
273 | radeon_cs_parser_fini(&parser, r); | 273 | radeon_cs_parser_fini(&parser, r); |
274 | mutex_unlock(&rdev->cs_mutex); | 274 | mutex_unlock(&rdev->cs_mutex); |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 84c53e41a88f..a823d8fe54c2 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -631,7 +631,7 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma) | |||
631 | return drm_mmap(filp, vma); | 631 | return drm_mmap(filp, vma); |
632 | } | 632 | } |
633 | 633 | ||
634 | file_priv = (struct drm_file *)filp->private_data; | 634 | file_priv = filp->private_data; |
635 | rdev = file_priv->minor->dev->dev_private; | 635 | rdev = file_priv->minor->dev->dev_private; |
636 | if (rdev == NULL) { | 636 | if (rdev == NULL) { |
637 | return -EINVAL; | 637 | return -EINVAL; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index 0fe31766e4cf..635c0ffee7fe 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |||
@@ -545,7 +545,7 @@ int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma) | |||
545 | struct drm_file *file_priv; | 545 | struct drm_file *file_priv; |
546 | struct vmw_private *dev_priv; | 546 | struct vmw_private *dev_priv; |
547 | 547 | ||
548 | file_priv = (struct drm_file *)filp->private_data; | 548 | file_priv = filp->private_data; |
549 | dev_priv = vmw_priv(file_priv->minor->dev); | 549 | dev_priv = vmw_priv(file_priv->minor->dev); |
550 | 550 | ||
551 | if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) || | 551 | if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) || |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c index 83123287c60c..1e8eedd901e0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | |||
@@ -39,7 +39,7 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma) | |||
39 | return drm_mmap(filp, vma); | 39 | return drm_mmap(filp, vma); |
40 | } | 40 | } |
41 | 41 | ||
42 | file_priv = (struct drm_file *)filp->private_data; | 42 | file_priv = filp->private_data; |
43 | dev_priv = vmw_priv(file_priv->minor->dev); | 43 | dev_priv = vmw_priv(file_priv->minor->dev); |
44 | return ttm_bo_mmap(filp, vma, &dev_priv->bdev); | 44 | return ttm_bo_mmap(filp, vma, &dev_priv->bdev); |
45 | } | 45 | } |
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c index 251b63165e2a..60befc0ee65f 100644 --- a/drivers/hwmon/adm1025.c +++ b/drivers/hwmon/adm1025.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * resolution of about 0.5% of the nominal value). Temperature values are | 12 | * resolution of about 0.5% of the nominal value). Temperature values are |
13 | * reported with a 1 deg resolution and a 3 deg accuracy. Complete | 13 | * reported with a 1 deg resolution and a 3 deg accuracy. Complete |
14 | * datasheet can be obtained from Analog's website at: | 14 | * datasheet can be obtained from Analog's website at: |
15 | * http://www.analog.com/Analog_Root/productPage/productHome/0,2121,ADM1025,00.html | 15 | * http://www.onsemi.com/PowerSolutions/product.do?id=ADM1025 |
16 | * | 16 | * |
17 | * This driver also supports the ADM1025A, which differs from the ADM1025 | 17 | * This driver also supports the ADM1025A, which differs from the ADM1025 |
18 | * only in that it has "open-drain VID inputs while the ADM1025 has | 18 | * only in that it has "open-drain VID inputs while the ADM1025 has |
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index 65335b268fa9..4bf969c0a32b 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | Chip details at: | 7 | Chip details at: |
8 | 8 | ||
9 | <http://www.analog.com/UploadedFiles/Data_Sheets/779263102ADM1026_a.pdf> | 9 | <http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026> |
10 | 10 | ||
11 | This program is free software; you can redistribute it and/or modify | 11 | This program is free software; you can redistribute it and/or modify |
12 | it under the terms of the GNU General Public License as published by | 12 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 9638d58f99fd..95cbfb3a7077 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c | |||
@@ -6,10 +6,10 @@ | |||
6 | * Datasheets available at: | 6 | * Datasheets available at: |
7 | * | 7 | * |
8 | * f75375: | 8 | * f75375: |
9 | * http://www.fintek.com.tw/files/productfiles/2005111152950.pdf | 9 | * http://www.fintek.com.tw/files/productfiles/F75375_V026P.pdf |
10 | * | 10 | * |
11 | * f75373: | 11 | * f75373: |
12 | * http://www.fintek.com.tw/files/productfiles/2005111153128.pdf | 12 | * http://www.fintek.com.tw/files/productfiles/F75373_V025P.pdf |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c index 1f63d1a3af5e..1d6a6fa31fb4 100644 --- a/drivers/hwmon/g760a.c +++ b/drivers/hwmon/g760a.c | |||
@@ -5,7 +5,7 @@ | |||
5 | Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org> | 5 | Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org> |
6 | 6 | ||
7 | Complete datasheet is available at GMT's website: | 7 | Complete datasheet is available at GMT's website: |
8 | http://www.gmt.com.tw/datasheet/g760a.pdf | 8 | http://www.gmt.com.tw/product/datasheet/EDS-760A.pdf |
9 | 9 | ||
10 | This program is free software; you can redistribute it and/or modify | 10 | This program is free software; you can redistribute it and/or modify |
11 | it under the terms of the GNU General Public License as published by | 11 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index bf0862a803c0..2b2ca1694f95 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * available at http://developer.intel.com/. | 38 | * available at http://developer.intel.com/. |
39 | * | 39 | * |
40 | * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094, | 40 | * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094, |
41 | * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26094.PDF | 41 | * http://support.amd.com/us/Processor_TechDocs/26094.PDF |
42 | * Table 74. VID Code Voltages | 42 | * Table 74. VID Code Voltages |
43 | * This corresponds to an arbitrary VRM code of 24 in the functions below. | 43 | * This corresponds to an arbitrary VRM code of 24 in the functions below. |
44 | * These CPU models (K8 revision <= E) have 5 VID pins. See also: | 44 | * These CPU models (K8 revision <= E) have 5 VID pins. See also: |
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index 45163693f737..97d98fbf5849 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * | 12 | * |
13 | * | 13 | * |
14 | * HighPoint has its own drivers (open source except for the RAID part) | 14 | * HighPoint has its own drivers (open source except for the RAID part) |
15 | * available from http://www.highpoint-tech.com/BIOS%20+%20Driver/. | 15 | * available from http://www.highpoint-tech.com/USA_new/service_support.htm |
16 | * This may be useful to anyone wanting to work on this driver, however do not | 16 | * This may be useful to anyone wanting to work on this driver, however do not |
17 | * trust them too much since the code tends to become less and less meaningful | 17 | * trust them too much since the code tends to become less and less meaningful |
18 | * as the time passes... :-/ | 18 | * as the time passes... :-/ |
diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c index d81e49680c3f..808bcdcbf8e1 100644 --- a/drivers/ide/ht6560b.c +++ b/drivers/ide/ht6560b.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * Author: Mikko Ala-Fossi <maf@iki.fi> | 10 | * Author: Mikko Ala-Fossi <maf@iki.fi> |
11 | * Jan Evert van Grootheest <j.e.van.grootheest@caiway.nl> | 11 | * Jan Evert van Grootheest <j.e.van.grootheest@caiway.nl> |
12 | * | 12 | * |
13 | * Try: http://www.maf.iki.fi/~maf/ht6560b/ | ||
14 | */ | 13 | */ |
15 | 14 | ||
16 | #define DRV_NAME "ht6560b" | 15 | #define DRV_NAME "ht6560b" |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 7c5b01ce51d2..274798068a54 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -435,12 +435,11 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq) | |||
435 | if (!(rq->cmd_flags & REQ_FLUSH)) | 435 | if (!(rq->cmd_flags & REQ_FLUSH)) |
436 | return BLKPREP_OK; | 436 | return BLKPREP_OK; |
437 | 437 | ||
438 | cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC); | 438 | cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); |
439 | 439 | ||
440 | /* FIXME: map struct ide_taskfile on rq->cmd[] */ | 440 | /* FIXME: map struct ide_taskfile on rq->cmd[] */ |
441 | BUG_ON(cmd == NULL); | 441 | BUG_ON(cmd == NULL); |
442 | 442 | ||
443 | memset(cmd, 0, sizeof(*cmd)); | ||
444 | if (ata_id_flush_ext_enabled(drive->id) && | 443 | if (ata_id_flush_ext_enabled(drive->id) && |
445 | (drive->capacity64 >= (1UL << 28))) | 444 | (drive->capacity64 >= (1UL << 28))) |
446 | cmd->tf.command = ATA_CMD_FLUSH_EXT; | 445 | cmd->tf.command = ATA_CMD_FLUSH_EXT; |
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 89d70de5e235..6e35eccc9caa 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
@@ -16,7 +16,7 @@ config INFINIBAND_USER_MAD | |||
16 | Userspace InfiniBand Management Datagram (MAD) support. This | 16 | Userspace InfiniBand Management Datagram (MAD) support. This |
17 | is the kernel side of the userspace MAD support, which allows | 17 | is the kernel side of the userspace MAD support, which allows |
18 | userspace processes to send and receive MADs. You will also | 18 | userspace processes to send and receive MADs. You will also |
19 | need libibumad from <http://www.openib.org>. | 19 | need libibumad from <http://www.openfabrics.org/downloads/management/>. |
20 | 20 | ||
21 | config INFINIBAND_USER_ACCESS | 21 | config INFINIBAND_USER_ACCESS |
22 | tristate "InfiniBand userspace access (verbs and CM)" | 22 | tristate "InfiniBand userspace access (verbs and CM)" |
@@ -28,7 +28,7 @@ config INFINIBAND_USER_ACCESS | |||
28 | to set up connections and directly access InfiniBand | 28 | to set up connections and directly access InfiniBand |
29 | hardware for fast-path operations. You will also need | 29 | hardware for fast-path operations. You will also need |
30 | libibverbs, libibcm and a hardware driver library from | 30 | libibverbs, libibcm and a hardware driver library from |
31 | <http://www.openib.org>. | 31 | <http://www.openfabrics.org/git/>. |
32 | 32 | ||
33 | config INFINIBAND_USER_MEM | 33 | config INFINIBAND_USER_MEM |
34 | bool | 34 | bool |
diff --git a/drivers/infiniband/hw/cxgb3/Kconfig b/drivers/infiniband/hw/cxgb3/Kconfig index 2acec3fadf69..2b6352b85485 100644 --- a/drivers/infiniband/hw/cxgb3/Kconfig +++ b/drivers/infiniband/hw/cxgb3/Kconfig | |||
@@ -10,7 +10,7 @@ config INFINIBAND_CXGB3 | |||
10 | our website at <http://www.chelsio.com>. | 10 | our website at <http://www.chelsio.com>. |
11 | 11 | ||
12 | For customer support, please visit our customer support page at | 12 | For customer support, please visit our customer support page at |
13 | <http://www.chelsio.com/support.htm>. | 13 | <http://www.chelsio.com/support.html>. |
14 | 14 | ||
15 | Please send feedback to <linux-bugs@chelsio.com>. | 15 | Please send feedback to <linux-bugs@chelsio.com>. |
16 | 16 | ||
diff --git a/drivers/infiniband/hw/cxgb4/Kconfig b/drivers/infiniband/hw/cxgb4/Kconfig index ccb85eaaad75..6b7e6c543534 100644 --- a/drivers/infiniband/hw/cxgb4/Kconfig +++ b/drivers/infiniband/hw/cxgb4/Kconfig | |||
@@ -10,7 +10,7 @@ config INFINIBAND_CXGB4 | |||
10 | our website at <http://www.chelsio.com>. | 10 | our website at <http://www.chelsio.com>. |
11 | 11 | ||
12 | For customer support, please visit our customer support page at | 12 | For customer support, please visit our customer support page at |
13 | <http://www.chelsio.com/support.htm>. | 13 | <http://www.chelsio.com/support.html>. |
14 | 14 | ||
15 | Please send feedback to <linux-bugs@chelsio.com>. | 15 | Please send feedback to <linux-bugs@chelsio.com>. |
16 | 16 | ||
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c index aa2be214270f..79d9971aff1f 100644 --- a/drivers/infiniband/hw/qib/qib_file_ops.c +++ b/drivers/infiniband/hw/qib/qib_file_ops.c | |||
@@ -1723,7 +1723,7 @@ static int qib_close(struct inode *in, struct file *fp) | |||
1723 | 1723 | ||
1724 | mutex_lock(&qib_mutex); | 1724 | mutex_lock(&qib_mutex); |
1725 | 1725 | ||
1726 | fd = (struct qib_filedata *) fp->private_data; | 1726 | fd = fp->private_data; |
1727 | fp->private_data = NULL; | 1727 | fp->private_data = NULL; |
1728 | rcd = fd->rcd; | 1728 | rcd = fd->rcd; |
1729 | if (!rcd) { | 1729 | if (!rcd) { |
@@ -1809,7 +1809,7 @@ static int qib_ctxt_info(struct file *fp, struct qib_ctxt_info __user *uinfo) | |||
1809 | struct qib_ctxtdata *rcd = ctxt_fp(fp); | 1809 | struct qib_ctxtdata *rcd = ctxt_fp(fp); |
1810 | struct qib_filedata *fd; | 1810 | struct qib_filedata *fd; |
1811 | 1811 | ||
1812 | fd = (struct qib_filedata *) fp->private_data; | 1812 | fd = fp->private_data; |
1813 | 1813 | ||
1814 | info.num_active = qib_count_active_units(); | 1814 | info.num_active = qib_count_active_units(); |
1815 | info.unit = rcd->dd->unit; | 1815 | info.unit = rcd->dd->unit; |
diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig index b411c51842da..d00af71a2cfc 100644 --- a/drivers/infiniband/ulp/iser/Kconfig +++ b/drivers/infiniband/ulp/iser/Kconfig | |||
@@ -9,4 +9,4 @@ config INFINIBAND_ISER | |||
9 | 9 | ||
10 | The iSER protocol is defined by IETF. | 10 | The iSER protocol is defined by IETF. |
11 | See <http://www.ietf.org/rfc/rfc5046.txt> | 11 | See <http://www.ietf.org/rfc/rfc5046.txt> |
12 | and <http://www.infinibandta.org/members/spec/Annex_iSER.PDF> | 12 | and <http://members.infinibandta.org/kwspub/spec/Annex_iSER.PDF> |
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index 0ffaf2c77a19..e68e49786483 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c | |||
@@ -521,9 +521,8 @@ static void gc_multi_process_packet(struct gc *gc) | |||
521 | * PSX support | 521 | * PSX support |
522 | * | 522 | * |
523 | * See documentation at: | 523 | * See documentation at: |
524 | * http://www.dim.com/~mackys/psxmemcard/ps-eng2.txt | 524 | * http://www.geocities.co.jp/Playtown/2004/psx/ps_eng.txt |
525 | * http://www.gamesx.com/controldata/psxcont/psxcont.htm | 525 | * http://www.gamesx.com/controldata/psxcont/psxcont.htm |
526 | * ftp://milano.usal.es/pablo/ | ||
527 | * | 526 | * |
528 | */ | 527 | */ |
529 | 528 | ||
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 2b0eba6619bd..b09c7d127219 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
@@ -259,7 +259,7 @@ static unsigned short keymap_usbph01(int scancode) | |||
259 | 259 | ||
260 | /* | 260 | /* |
261 | * Keymap for ATCom AU-100 | 261 | * Keymap for ATCom AU-100 |
262 | * http://www.atcom.cn/En_products_AU100.html | 262 | * http://www.atcom.cn/products.html |
263 | * http://www.packetizer.com/products/au100/ | 263 | * http://www.packetizer.com/products/au100/ |
264 | * http://www.voip-info.org/wiki/view/AU-100 | 264 | * http://www.voip-info.org/wiki/view/AU-100 |
265 | * | 265 | * |
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index c714ca2407f8..bf5fd7f6a313 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
@@ -30,6 +30,7 @@ config MOUSE_PS2 | |||
30 | <http://w1.894.telia.com/~u89404340/touchpad/index.html> | 30 | <http://w1.894.telia.com/~u89404340/touchpad/index.html> |
31 | and a new version of GPM at: | 31 | and a new version of GPM at: |
32 | <http://www.geocities.com/dt_or/gpm/gpm.html> | 32 | <http://www.geocities.com/dt_or/gpm/gpm.html> |
33 | <http://xorg.freedesktop.org/archive/individual/driver/> | ||
33 | to take advantage of the advanced features of the touchpad. | 34 | to take advantage of the advanced features of the touchpad. |
34 | 35 | ||
35 | If unsure, say Y. | 36 | If unsure, say Y. |
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c index 88121c59c3cc..1fd8f5e192f9 100644 --- a/drivers/input/mouse/touchkit_ps2.c +++ b/drivers/input/mouse/touchkit_ps2.c | |||
@@ -21,8 +21,8 @@ | |||
21 | * | 21 | * |
22 | * Based upon touchkitusb.c | 22 | * Based upon touchkitusb.c |
23 | * | 23 | * |
24 | * Vendor documentation is available in support section of: | 24 | * Vendor documentation is available at: |
25 | * http://www.egalax.com.tw/ | 25 | * http://home.eeti.com.tw/web20/drivers/Software%20Programming%20Guide_v2.0.pdf |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c index efd3aebaba5f..36e57deacd03 100644 --- a/drivers/input/touchscreen/mk712.c +++ b/drivers/input/touchscreen/mk712.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * found in Gateway AOL Connected Touchpad computers. | 17 | * found in Gateway AOL Connected Touchpad computers. |
18 | * | 18 | * |
19 | * Documentation for ICS MK712 can be found at: | 19 | * Documentation for ICS MK712 can be found at: |
20 | * http://www.icst.com/pdf/mk712.pdf | 20 | * http://www.idt.com/products/getDoc.cfm?docID=18713923 |
21 | */ | 21 | */ |
22 | 22 | ||
23 | /* | 23 | /* |
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c index 861bdf3421f2..d5013935ac62 100644 --- a/drivers/isdn/i4l/isdn_audio.c +++ b/drivers/isdn/i4l/isdn_audio.c | |||
@@ -439,7 +439,7 @@ isdn_audio_xlaw2adpcm(adpcm_state * s, int fmt, unsigned char *in, | |||
439 | 439 | ||
440 | /* | 440 | /* |
441 | * Goertzel algorithm. | 441 | * Goertzel algorithm. |
442 | * See http://ptolemy.eecs.berkeley.edu/~pino/Ptolemy/papers/96/dtmf_ict/ | 442 | * See http://ptolemy.eecs.berkeley.edu/papers/96/dtmf_ict/ |
443 | * for more info. | 443 | * for more info. |
444 | * Result is stored into an sk_buff and queued up for later | 444 | * Result is stored into an sk_buff and queued up for later |
445 | * evaluation. | 445 | * evaluation. |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index d0d221332db0..9e3e2c566598 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -3,9 +3,9 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt | 4 | * Copyright (C) 2003, 2004 Colin Leroy, Rasmus Rohde, Benjamin Herrenschmidt |
5 | * | 5 | * |
6 | * Documentation from | 6 | * Documentation from 115254175ADT7467_pra.pdf and 3686221171167ADT7460_b.pdf |
7 | * http://www.analog.com/UploadedFiles/Data_Sheets/115254175ADT7467_pra.pdf | 7 | * http://www.onsemi.com/PowerSolutions/product.do?id=ADT7467 |
8 | * http://www.analog.com/UploadedFiles/Data_Sheets/3686221171167ADT7460_b.pdf | 8 | * http://www.onsemi.com/PowerSolutions/product.do?id=ADT7460 |
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | 11 | ||
diff --git a/drivers/media/IR/keymaps/rc-manli.c b/drivers/media/IR/keymaps/rc-manli.c index 1e9fbfa90a1e..0f590b3d01c0 100644 --- a/drivers/media/IR/keymaps/rc-manli.c +++ b/drivers/media/IR/keymaps/rc-manli.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <media/rc-map.h> | 13 | #include <media/rc-map.h> |
14 | 14 | ||
15 | /* Michael Tokarev <mjt@tls.msk.ru> | 15 | /* Michael Tokarev <mjt@tls.msk.ru> |
16 | http://www.corpit.ru/mjt/beholdTV/remote_control.jpg | ||
17 | keytable is used by MANLI MTV00[0x0c] and BeholdTV 40[13] at | 16 | keytable is used by MANLI MTV00[0x0c] and BeholdTV 40[13] at |
18 | least, and probably other cards too. | 17 | least, and probably other cards too. |
19 | The "ascii-art picture" below (in comments, first row | 18 | The "ascii-art picture" below (in comments, first row |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 893fbc57c72f..a12b88f53ed9 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 26 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
27 | * | 27 | * |
28 | * | 28 | * |
29 | * the project's page is at http://www.linuxtv.org/dvb/ | 29 | * the project's page is at http://www.linuxtv.org/ |
30 | */ | 30 | */ |
31 | 31 | ||
32 | 32 | ||
@@ -2291,12 +2291,7 @@ static int frontend_init(struct av7110 *av7110) | |||
2291 | /* Budgetpatch note: | 2291 | /* Budgetpatch note: |
2292 | * Original hardware design by Roberto Deza: | 2292 | * Original hardware design by Roberto Deza: |
2293 | * There is a DVB_Wiki at | 2293 | * There is a DVB_Wiki at |
2294 | * http://212.227.36.83/linuxtv/wiki/index.php/Main_Page | 2294 | * http://www.linuxtv.org/ |
2295 | * where is described this 'DVB TT Budget Patch', on Card Modding: | ||
2296 | * http://212.227.36.83/linuxtv/wiki/index.php/DVB_TT_Budget_Patch | ||
2297 | * On the short description there is also a link to a external file, | ||
2298 | * with more details: | ||
2299 | * http://perso.wanadoo.es/jesussolano/Ttf_tsc1.zip | ||
2300 | * | 2295 | * |
2301 | * New software triggering design by Emard that works on | 2296 | * New software triggering design by Emard that works on |
2302 | * original Roberto Deza's hardware: | 2297 | * original Roberto Deza's hardware: |
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 6ef3996565ad..244d5d51f5f9 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 25 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
26 | * | 26 | * |
27 | * | 27 | * |
28 | * the project's page is at http://www.linuxtv.org/dvb/ | 28 | * the project's page is at http://www.linuxtv.org/ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c index 43f61f2eca98..122c72806916 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/dvb/ttpci/av7110_ca.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 25 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
26 | * | 26 | * |
27 | * | 27 | * |
28 | * the project's page is at http://www.linuxtv.org/dvb/ | 28 | * the project's page is at http://www.linuxtv.org/ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index e162691b515d..f1cbfe526989 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 22 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
23 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 23 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
24 | * | 24 | * |
25 | * the project's page is at http://www.linuxtv.org/dvb/ | 25 | * the project's page is at http://www.linuxtv.org/ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | /* for debugging ARM communication: */ | 28 | /* for debugging ARM communication: */ |
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index 8986d967d2f4..ac20c5bbfa43 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 22 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
23 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 23 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
24 | * | 24 | * |
25 | * the project's page is at http://www.linuxtv.org/dvb/ | 25 | * the project's page is at http://www.linuxtv.org/ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index 983672aa2450..97afc01f60d0 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 30 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
31 | * | 31 | * |
32 | * | 32 | * |
33 | * the project's page is at http://www.linuxtv.org/dvb/ | 33 | * the project's page is at http://www.linuxtv.org/ |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "budget.h" | 36 | #include "budget.h" |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 13ac9e3ab121..a9c2c326df4b 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 26 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
27 | * | 27 | * |
28 | * | 28 | * |
29 | * the project's page is at http://www.linuxtv.org/dvb/ | 29 | * the project's page is at http://www.linuxtv.org/ |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c index ba18e56d5f11..054661315311 100644 --- a/drivers/media/dvb/ttpci/budget-core.c +++ b/drivers/media/dvb/ttpci/budget-core.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
32 | * | 32 | * |
33 | * | 33 | * |
34 | * the project's page is at http://www.linuxtv.org/dvb/ | 34 | * the project's page is at http://www.linuxtv.org/ |
35 | */ | 35 | */ |
36 | 36 | ||
37 | 37 | ||
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 9c92f9ddd223..579835590690 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -27,7 +27,7 @@ | |||
27 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 27 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
28 | * | 28 | * |
29 | * | 29 | * |
30 | * the project's page is at http://www.linuxtv.org/dvb/ | 30 | * the project's page is at http://www.linuxtv.org/ |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "av7110.h" | 33 | #include "av7110.h" |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 874a10a9d493..d238fb9371a7 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
32 | * | 32 | * |
33 | * | 33 | * |
34 | * the project's page is at http://www.linuxtv.org/dvb/ | 34 | * the project's page is at http://www.linuxtv.org/ |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "budget.h" | 37 | #include "budget.h" |
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 4349213b403b..255d40df4b46 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * anybody does please mail me. | 13 | * anybody does please mail me. |
14 | * | 14 | * |
15 | * For the pdf file see: | 15 | * For the pdf file see: |
16 | * http://www.semiconductors.philips.com/pip/TEA5757H/V1 | 16 | * http://www.nxp.com/acrobat_download2/expired_datasheets/TEA5757_5759_3.pdf |
17 | * | 17 | * |
18 | * | 18 | * |
19 | * CHANGES: | 19 | * CHANGES: |
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c index 03439282dfce..b1f630527dc1 100644 --- a/drivers/media/radio/radio-typhoon.c +++ b/drivers/media/radio/radio-typhoon.c | |||
@@ -1,9 +1,6 @@ | |||
1 | /* Typhoon Radio Card driver for radio support | 1 | /* Typhoon Radio Card driver for radio support |
2 | * (c) 1999 Dr. Henrik Seidel <Henrik.Seidel@gmx.de> | 2 | * (c) 1999 Dr. Henrik Seidel <Henrik.Seidel@gmx.de> |
3 | * | 3 | * |
4 | * Card manufacturer: | ||
5 | * http://194.18.155.92/idc/prod2.idc?nr=50753&lang=e | ||
6 | * | ||
7 | * Notes on the hardware | 4 | * Notes on the hardware |
8 | * | 5 | * |
9 | * This card has two output sockets, one for speakers and one for line. | 6 | * This card has two output sockets, one for speakers and one for line. |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index f6e4d0475351..d000522cb0f4 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -978,7 +978,7 @@ config USB_STKWEBCAM | |||
978 | Supported devices are typically found in some Asus laptops, | 978 | Supported devices are typically found in some Asus laptops, |
979 | with USB id 174f:a311 and 05e1:0501. Other Syntek cameras | 979 | with USB id 174f:a311 and 05e1:0501. Other Syntek cameras |
980 | may be supported by the stk11xx driver, from which this is | 980 | may be supported by the stk11xx driver, from which this is |
981 | derived, see http://stk11xx.sourceforge.net | 981 | derived, see <http://sourceforge.net/projects/syntekdriver/> |
982 | 982 | ||
983 | To compile this driver as a module, choose M here: the | 983 | To compile this driver as a module, choose M here: the |
984 | module will be called stkwebcam. | 984 | module will be called stkwebcam. |
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index be35e6965829..9536f1a40dd2 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * sensor. | 4 | * sensor. |
5 | * | 5 | * |
6 | * The data sheet for this device can be found at: | 6 | * The data sheet for this device can be found at: |
7 | * http://www.marvell.com/products/pcconn/88ALP01.jsp | 7 | * http://www.marvell.com/products/pc_connectivity/88alp01/ |
8 | * | 8 | * |
9 | * Copyright 2006 One Laptop Per Child Association, Inc. | 9 | * Copyright 2006 One Laptop Per Child Association, Inc. |
10 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> | 10 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> |
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index 6b805afe5d20..fe1090940b01 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
@@ -39,7 +39,7 @@ static struct cx18_card_tuner_i2c cx18_i2c_std = { | |||
39 | .tv = { 0x61, 0x60, I2C_CLIENT_END }, | 39 | .tv = { 0x61, 0x60, I2C_CLIENT_END }, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | /* Please add new PCI IDs to: http://pci-ids.ucw.cz/iii | 42 | /* Please add new PCI IDs to: http://pci-ids.ucw.cz/ |
43 | This keeps the PCI ID database up to date. Note that the entries | 43 | This keeps the PCI ID database up to date. Note that the entries |
44 | must be added under vendor 0x4444 (Conexant) as subsystem IDs. | 44 | must be added under vendor 0x4444 (Conexant) as subsystem IDs. |
45 | New vendor IDs should still be added to the vendor ID list. */ | 45 | New vendor IDs should still be added to the vendor ID list. */ |
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index abd64e89f60f..53a67824071b 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * (c) 2008 Steven Toth <stoth@linuxtv.org> | 7 | * (c) 2008 Steven Toth <stoth@linuxtv.org> |
8 | * - CX23885/7/8 support | 8 | * - CX23885/7/8 support |
9 | * | 9 | * |
10 | * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), | 10 | * Includes parts from the ivtv driver <http://sourceforge.net/projects/ivtv/> |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
13 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index e46e1ceef72c..660b2a927feb 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org> | 9 | * (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org> |
10 | * - video_ioctl2 conversion | 10 | * - video_ioctl2 conversion |
11 | * | 11 | * |
12 | * Includes parts from the ivtv driver( http://ivtv.sourceforge.net/), | 12 | * Includes parts from the ivtv driver <http://sourceforge.net/projects/ivtv/> |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c index ca1fd3227a93..87afbbee2063 100644 --- a/drivers/media/video/ivtv/ivtv-cards.c +++ b/drivers/media/video/ivtv/ivtv-cards.c | |||
@@ -65,7 +65,7 @@ static struct ivtv_card_tuner_i2c ivtv_i2c_tda8290 = { | |||
65 | 65 | ||
66 | /********************** card configuration *******************************/ | 66 | /********************** card configuration *******************************/ |
67 | 67 | ||
68 | /* Please add new PCI IDs to: http://pci-ids.ucw.cz/iii | 68 | /* Please add new PCI IDs to: http://pci-ids.ucw.cz/ |
69 | This keeps the PCI ID database up to date. Note that the entries | 69 | This keeps the PCI ID database up to date. Note that the entries |
70 | must be added under vendor 0x4444 (Conexant) as subsystem IDs. | 70 | must be added under vendor 0x4444 (Conexant) as subsystem IDs. |
71 | New vendor IDs should still be added to the vendor ID list. */ | 71 | New vendor IDs should still be added to the vendor ID list. */ |
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index ef0c8178f255..b1dbcf1d2bcb 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | Copyright (C) 1998-2006 Michael Hunold <michael@mihu.de> | 4 | Copyright (C) 1998-2006 Michael Hunold <michael@mihu.de> |
5 | 5 | ||
6 | Visit http://www.mihu.de/linux/saa7146/mxb/ | 6 | Visit http://www.themm.net/~mihu/linux/saa7146/mxb.html |
7 | for further details about this card. | 7 | for further details about this card. |
8 | 8 | ||
9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c index 2782f94cf6f8..2e86fdc86989 100644 --- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c +++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * * | 4 | * * |
5 | * Copyright (C) 2004 by Carlos Eduardo Medaglia Dyonisio * | 5 | * Copyright (C) 2004 by Carlos Eduardo Medaglia Dyonisio * |
6 | * <medaglia@undl.org.br> * | 6 | * <medaglia@undl.org.br> * |
7 | * http://cadu.homelinux.com:8080/ * | ||
8 | * * | 7 | * * |
9 | * Support for SN9C103, DAC Magnitude, exposure and green gain controls * | 8 | * Support for SN9C103, DAC Magnitude, exposure and green gain controls * |
10 | * added by Luca Risolia <luca.risolia@studio.unibo.it> * | 9 | * added by Luca Risolia <luca.risolia@studio.unibo.it> * |
diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h index 5c27b251354e..b654bfff8740 100644 --- a/drivers/media/video/zoran/videocodec.h +++ b/drivers/media/video/zoran/videocodec.h | |||
@@ -56,7 +56,7 @@ | |||
56 | the slave is bound to it). Otherwise it doesn't need this functions and | 56 | the slave is bound to it). Otherwise it doesn't need this functions and |
57 | therfor they may not be initialized. | 57 | therfor they may not be initialized. |
58 | 58 | ||
59 | The other fuctions are just for convenience, as they are for sure used by | 59 | The other functions are just for convenience, as they are for sure used by |
60 | most/all of the codecs. The last ones may be ommited, too. | 60 | most/all of the codecs. The last ones may be ommited, too. |
61 | 61 | ||
62 | See the structure declaration below for more information and which data has | 62 | See the structure declaration below for more information and which data has |
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index 6f89d0a096ea..3c471a4e3e4a 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
@@ -1177,7 +1177,7 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height | |||
1177 | if (height > BUZ_MAX_HEIGHT) | 1177 | if (height > BUZ_MAX_HEIGHT) |
1178 | height = BUZ_MAX_HEIGHT; | 1178 | height = BUZ_MAX_HEIGHT; |
1179 | 1179 | ||
1180 | /* Check for vaild parameters */ | 1180 | /* Check for invalid parameters */ |
1181 | if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT || | 1181 | if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT || |
1182 | width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) { | 1182 | width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) { |
1183 | dprintk(1, | 1183 | dprintk(1, |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index db2fbe2d4146..1f69743b12ec 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -112,8 +112,8 @@ config IBM_ASM | |||
112 | 112 | ||
113 | WARNING: This software may not be supported or function | 113 | WARNING: This software may not be supported or function |
114 | correctly on your IBM server. Please consult the IBM ServerProven | 114 | correctly on your IBM server. Please consult the IBM ServerProven |
115 | website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for | 115 | website <http://www-03.ibm.com/systems/info/x86servers/serverproven/compat/us/> |
116 | information on the specific driver level and support statement | 116 | for information on the specific driver level and support statement |
117 | for your IBM server. | 117 | for your IBM server. |
118 | 118 | ||
119 | config PHANTOM | 119 | config PHANTOM |
@@ -385,7 +385,7 @@ config BMP085 | |||
385 | depends on I2C && SYSFS | 385 | depends on I2C && SYSFS |
386 | help | 386 | help |
387 | If you say yes here you get support for the Bosch Sensortec | 387 | If you say yes here you get support for the Bosch Sensortec |
388 | BMP086 digital pressure sensor. | 388 | BMP085 digital pressure sensor. |
389 | 389 | ||
390 | To compile this driver as a module, choose M here: the | 390 | To compile this driver as a module, choose M here: the |
391 | module will be called bmp085. | 391 | module will be called bmp085. |
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 3e6c47bdce53..ba29d2f0ffd7 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | |||
@@ -418,8 +418,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) | |||
418 | 418 | ||
419 | /* | 419 | /* |
420 | * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 | 420 | * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 |
421 | * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 | 421 | * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 |
422 | * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf | 422 | * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf |
423 | * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf | 423 | * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf |
424 | */ | 424 | */ |
425 | if (extp->MajorVersion != '1' || | 425 | if (extp->MajorVersion != '1' || |
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c index f4359fe7150f..caf604167f03 100644 --- a/drivers/mtd/devices/lart.c +++ b/drivers/mtd/devices/lart.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * - January 2000 | 17 | * - January 2000 |
18 | * | 18 | * |
19 | * [2] MTD internal API documentation | 19 | * [2] MTD internal API documentation |
20 | * - http://www.linux-mtd.infradead.org/tech/ | 20 | * - http://www.linux-mtd.infradead.org/ |
21 | * | 21 | * |
22 | * Limitations: | 22 | * Limitations: |
23 | * | 23 | * |
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index 4d6a64c387ec..037b399df3f1 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | Use of the FTL format for non-PCMCIA applications may be an | 52 | Use of the FTL format for non-PCMCIA applications may be an |
53 | infringement of these patents. For additional information, | 53 | infringement of these patents. For additional information, |
54 | contact M-Systems (http://www.m-sys.com) directly. | 54 | contact M-Systems directly. M-Systems since acquired by Sandisk. |
55 | 55 | ||
56 | ======================================================================*/ | 56 | ======================================================================*/ |
57 | #include <linux/mtd/blktrans.h> | 57 | #include <linux/mtd/blktrans.h> |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 701d942c6795..962212628f6e 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -172,7 +172,7 @@ config MTD_OCTAGON | |||
172 | This provides a 'mapping' driver which supports the way in which | 172 | This provides a 'mapping' driver which supports the way in which |
173 | the flash chips are connected in the Octagon-5066 Single Board | 173 | the flash chips are connected in the Octagon-5066 Single Board |
174 | Computer. More information on the board is available at | 174 | Computer. More information on the board is available at |
175 | <http://www.octagonsystems.com/CPUpages/5066.html>. | 175 | <http://www.octagonsystems.com/products/5066.aspx>. |
176 | 176 | ||
177 | config MTD_VMAX | 177 | config MTD_VMAX |
178 | tristate "JEDEC Flash device mapped on Tempustech VMAX SBC301" | 178 | tristate "JEDEC Flash device mapped on Tempustech VMAX SBC301" |
@@ -284,7 +284,7 @@ config MTD_TQM8XXL | |||
284 | chips, currently uses AMD one. This 'mapping' driver supports | 284 | chips, currently uses AMD one. This 'mapping' driver supports |
285 | that arrangement, allowing the CFI probe and command set driver | 285 | that arrangement, allowing the CFI probe and command set driver |
286 | code to communicate with the chips on the TQM8xxL board. More at | 286 | code to communicate with the chips on the TQM8xxL board. More at |
287 | <http://www.denx.de/embedded-ppc-en.html>. | 287 | <http://www.denx.de/wiki/PPCEmbedded/>. |
288 | 288 | ||
289 | config MTD_RPXLITE | 289 | config MTD_RPXLITE |
290 | tristate "CFI Flash device mapped on RPX Lite or CLLF" | 290 | tristate "CFI Flash device mapped on RPX Lite or CLLF" |
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index db1dfc5a1b11..e06c8983978e 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01 | 2 | * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01 |
3 | * | 3 | * |
4 | * The data sheet for this device can be found at: | 4 | * The data sheet for this device can be found at: |
5 | * http://www.marvell.com/products/pcconn/88ALP01.jsp | 5 | * http://wiki.laptop.org/go/Datasheets |
6 | * | 6 | * |
7 | * Copyright © 2006 Red Hat, Inc. | 7 | * Copyright © 2006 Red Hat, Inc. |
8 | * Copyright © 2006 David Woodhouse <dwmw2@infradead.org> | 8 | * Copyright © 2006 David Woodhouse <dwmw2@infradead.org> |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7ca1fc8a3a76..77c1fab7d774 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -924,7 +924,7 @@ config SMC91X | |||
924 | including the SMC91C94 and the SMC91C111. Say Y if you want it | 924 | including the SMC91C94 and the SMC91C111. Say Y if you want it |
925 | compiled into the kernel, and read the file | 925 | compiled into the kernel, and read the file |
926 | <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, | 926 | <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, |
927 | available from <http://www.linuxdoc.org/docs.html#howto>. | 927 | available from <http://www.tldp.org/docs.html#howto>. |
928 | 928 | ||
929 | This driver is also available as a module ( = code which can be | 929 | This driver is also available as a module ( = code which can be |
930 | inserted in and removed from the running kernel whenever you want). | 930 | inserted in and removed from the running kernel whenever you want). |
@@ -1034,7 +1034,7 @@ config SMC911X | |||
1034 | including the new LAN9115, LAN9116, LAN9117, and LAN9118. | 1034 | including the new LAN9115, LAN9116, LAN9117, and LAN9118. |
1035 | Say Y if you want it compiled into the kernel, | 1035 | Say Y if you want it compiled into the kernel, |
1036 | and read the Ethernet-HOWTO, available from | 1036 | and read the Ethernet-HOWTO, available from |
1037 | <http://www.linuxdoc.org/docs.html#howto>. | 1037 | <http://www.tldp.org/docs.html#howto>. |
1038 | 1038 | ||
1039 | This driver is also available as a module. The module will be | 1039 | This driver is also available as a module. The module will be |
1040 | called smc911x. If you want to compile it as a module, say M | 1040 | called smc911x. If you want to compile it as a module, say M |
@@ -1516,7 +1516,7 @@ config E100 | |||
1516 | 1516 | ||
1517 | For the latest Intel PRO/100 network driver for Linux, see: | 1517 | For the latest Intel PRO/100 network driver for Linux, see: |
1518 | 1518 | ||
1519 | <http://appsr.intel.com/scripts-df/support_intel.asp> | 1519 | <http://www.intel.com/p/en_US/support/highlights/network/pro100plus> |
1520 | 1520 | ||
1521 | More specific information on configuring the driver is in | 1521 | More specific information on configuring the driver is in |
1522 | <file:Documentation/networking/e100.txt>. | 1522 | <file:Documentation/networking/e100.txt>. |
@@ -1542,9 +1542,8 @@ config FEALNX | |||
1542 | select CRC32 | 1542 | select CRC32 |
1543 | select MII | 1543 | select MII |
1544 | help | 1544 | help |
1545 | Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet | 1545 | Say Y here to support the Myson MTD-800 family of PCI-based Ethernet |
1546 | cards. Specifications and data at | 1546 | cards. <http://www.myson.com.tw/> |
1547 | <http://www.myson.com.hk/mtd/datasheet/>. | ||
1548 | 1547 | ||
1549 | config NATSEMI | 1548 | config NATSEMI |
1550 | tristate "National Semiconductor DP8381x series PCI Ethernet support" | 1549 | tristate "National Semiconductor DP8381x series PCI Ethernet support" |
@@ -1718,7 +1717,7 @@ config SMSC9420 | |||
1718 | This is a driver for SMSC's LAN9420 PCI ethernet adapter. | 1717 | This is a driver for SMSC's LAN9420 PCI ethernet adapter. |
1719 | Say Y if you want it compiled into the kernel, | 1718 | Say Y if you want it compiled into the kernel, |
1720 | and read the Ethernet-HOWTO, available from | 1719 | and read the Ethernet-HOWTO, available from |
1721 | <http://www.linuxdoc.org/docs.html#howto>. | 1720 | <http://www.tldp.org/docs.html#howto>. |
1722 | 1721 | ||
1723 | This driver is also available as a module. The module will be | 1722 | This driver is also available as a module. The module will be |
1724 | called smsc9420. If you want to compile it as a module, say M | 1723 | called smsc9420. If you want to compile it as a module, say M |
@@ -2565,7 +2564,7 @@ config CHELSIO_T1 | |||
2565 | our website at <http://www.chelsio.com>. | 2564 | our website at <http://www.chelsio.com>. |
2566 | 2565 | ||
2567 | For customer support, please visit our customer support page at | 2566 | For customer support, please visit our customer support page at |
2568 | <http://www.chelsio.com/support.htm>. | 2567 | <http://www.chelsio.com/support.html>. |
2569 | 2568 | ||
2570 | Please send feedback to <linux-bugs@chelsio.com>. | 2569 | Please send feedback to <linux-bugs@chelsio.com>. |
2571 | 2570 | ||
@@ -2597,7 +2596,7 @@ config CHELSIO_T3 | |||
2597 | our website at <http://www.chelsio.com>. | 2596 | our website at <http://www.chelsio.com>. |
2598 | 2597 | ||
2599 | For customer support, please visit our customer support page at | 2598 | For customer support, please visit our customer support page at |
2600 | <http://www.chelsio.com/support.htm>. | 2599 | <http://www.chelsio.com/support.html>. |
2601 | 2600 | ||
2602 | Please send feedback to <linux-bugs@chelsio.com>. | 2601 | Please send feedback to <linux-bugs@chelsio.com>. |
2603 | 2602 | ||
@@ -2622,7 +2621,7 @@ config CHELSIO_T4 | |||
2622 | our website at <http://www.chelsio.com>. | 2621 | our website at <http://www.chelsio.com>. |
2623 | 2622 | ||
2624 | For customer support, please visit our customer support page at | 2623 | For customer support, please visit our customer support page at |
2625 | <http://www.chelsio.com/support.htm>. | 2624 | <http://www.chelsio.com/support.html>. |
2626 | 2625 | ||
2627 | Please send feedback to <linux-bugs@chelsio.com>. | 2626 | Please send feedback to <linux-bugs@chelsio.com>. |
2628 | 2627 | ||
@@ -2645,7 +2644,7 @@ config CHELSIO_T4VF | |||
2645 | our website at <http://www.chelsio.com>. | 2644 | our website at <http://www.chelsio.com>. |
2646 | 2645 | ||
2647 | For customer support, please visit our customer support page at | 2646 | For customer support, please visit our customer support page at |
2648 | <http://www.chelsio.com/support.htm>. | 2647 | <http://www.chelsio.com/support.html>. |
2649 | 2648 | ||
2650 | Please send feedback to <linux-bugs@chelsio.com>. | 2649 | Please send feedback to <linux-bugs@chelsio.com>. |
2651 | 2650 | ||
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index 20f97e7017ce..0b376a990972 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig | |||
@@ -19,7 +19,7 @@ config ATALK | |||
19 | 19 | ||
20 | General information about how to connect Linux, Windows machines and | 20 | General information about how to connect Linux, Windows machines and |
21 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The | 21 | Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. The |
22 | NET-3-HOWTO, available from | 22 | NET3-4-HOWTO, available from |
23 | <http://www.tldp.org/docs.html#howto>, contains valuable | 23 | <http://www.tldp.org/docs.html#howto>, contains valuable |
24 | information as well. | 24 | information as well. |
25 | 25 | ||
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index dfd96b20547f..f3459798b0e9 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -68,7 +68,7 @@ static int xcvr[NUM_UNITS]; /* The data transfer mode. */ | |||
68 | 68 | ||
69 | In 1997 Realtek made available the documentation for the second generation | 69 | In 1997 Realtek made available the documentation for the second generation |
70 | RTL8012 chip, which has lead to several driver improvements. | 70 | RTL8012 chip, which has lead to several driver improvements. |
71 | http://www.realtek.com.tw/cn/cn.html | 71 | http://www.realtek.com.tw/ |
72 | 72 | ||
73 | Theory of Operation | 73 | Theory of Operation |
74 | 74 | ||
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 44c0694c1f4e..91b3846ffc8a 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -1487,7 +1487,7 @@ static void __init depca_platform_probe (void) | |||
1487 | if (!pldev->dev.driver) { | 1487 | if (!pldev->dev.driver) { |
1488 | /* The driver was not bound to this device, there was | 1488 | /* The driver was not bound to this device, there was |
1489 | * no hardware at this address. Unregister it, as the | 1489 | * no hardware at this address. Unregister it, as the |
1490 | * release fuction will take care of freeing the | 1490 | * release function will take care of freeing the |
1491 | * allocated structure */ | 1491 | * allocated structure */ |
1492 | 1492 | ||
1493 | depca_io_ports[i].device = NULL; | 1493 | depca_io_ports[i].device = NULL; |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 32543a300b81..aa56963ad558 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -131,8 +131,8 @@ IIIa. Ring buffers | |||
131 | 131 | ||
132 | IVb. References | 132 | IVb. References |
133 | 133 | ||
134 | http://www.smsc.com/main/tools/discontinued/83c171.pdf | 134 | http://www.smsc.com/media/Downloads_Public/discontinued/83c171.pdf |
135 | http://www.smsc.com/main/tools/discontinued/83c175.pdf | 135 | http://www.smsc.com/media/Downloads_Public/discontinued/83c175.pdf |
136 | http://scyld.com/expert/NWay.html | 136 | http://scyld.com/expert/NWay.html |
137 | http://www.national.com/pf/DP/DP83840A.html | 137 | http://www.national.com/pf/DP/DP83840A.html |
138 | 138 | ||
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 62d5d5cfd6a6..95dbcfdf131d 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
@@ -73,7 +73,7 @@ config DMASCC | |||
73 | certain parameters, such as channel access timing, clock mode, and | 73 | certain parameters, such as channel access timing, clock mode, and |
74 | DMA channel. This is accomplished with a small utility program, | 74 | DMA channel. This is accomplished with a small utility program, |
75 | dmascc_cfg, available at | 75 | dmascc_cfg, available at |
76 | <http://cacofonix.nt.tuwien.ac.at/~oe1kib/Linux/>. Please be sure to | 76 | <http://www.linux-ax25.org/wiki/Ax25-tools>. Please be sure to |
77 | get at least version 1.27 of dmascc_cfg, as older versions will not | 77 | get at least version 1.27 of dmascc_cfg, as older versions will not |
78 | work with the current driver. | 78 | work with the current driver. |
79 | 79 | ||
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 0037a696cd0a..94d9969ec0bb 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c | |||
@@ -23,7 +23,7 @@ paper sources: | |||
23 | 'LAN Technical Reference Ethernet Adapter Interface Version 1 Release 1.0 | 23 | 'LAN Technical Reference Ethernet Adapter Interface Version 1 Release 1.0 |
24 | Document Number SC30-3661-00' by IBM for info on the adapter itself | 24 | Document Number SC30-3661-00' by IBM for info on the adapter itself |
25 | 25 | ||
26 | Also see http://www.natsemi.com/ | 26 | Also see http://www.national.com/analog |
27 | 27 | ||
28 | special acknowledgements to: | 28 | special acknowledgements to: |
29 | - Bob Eager for helping me out with documentation from IBM | 29 | - Bob Eager for helping me out with documentation from IBM |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 75155a27fdde..14db09e2fa8b 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -3540,7 +3540,7 @@ enum latency_range { | |||
3540 | * Stores a new ITR value based on strictly on packet size. This | 3540 | * Stores a new ITR value based on strictly on packet size. This |
3541 | * algorithm is less sophisticated than that used in igb_update_itr, | 3541 | * algorithm is less sophisticated than that used in igb_update_itr, |
3542 | * due to the difficulty of synchronizing statistics across multiple | 3542 | * due to the difficulty of synchronizing statistics across multiple |
3543 | * receive rings. The divisors and thresholds used by this fuction | 3543 | * receive rings. The divisors and thresholds used by this function |
3544 | * were determined based on theoretical maximum wire speed and testing | 3544 | * were determined based on theoretical maximum wire speed and testing |
3545 | * data, in order to minimize response time while increasing bulk | 3545 | * data, in order to minimize response time while increasing bulk |
3546 | * throughput. | 3546 | * throughput. |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index a3cb109006a5..92631eb6f6a3 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -142,7 +142,7 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable); | |||
142 | * Function ali_ircc_init () | 142 | * Function ali_ircc_init () |
143 | * | 143 | * |
144 | * Initialize chip. Find out whay kinds of chips we are dealing with | 144 | * Initialize chip. Find out whay kinds of chips we are dealing with |
145 | * and their configuation registers address | 145 | * and their configuration registers address |
146 | */ | 146 | */ |
147 | static int __init ali_ircc_init(void) | 147 | static int __init ali_ircc_init(void) |
148 | { | 148 | { |
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 36c3060411d2..4dc39e5f0156 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -54,7 +54,7 @@ | |||
54 | /* anyone who has. HOWEVER the chip bears a striking resemblence */ | 54 | /* anyone who has. HOWEVER the chip bears a striking resemblence */ |
55 | /* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ | 55 | /* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ |
56 | /* the documentation for this is freely available at */ | 56 | /* the documentation for this is freely available at */ |
57 | /* http://www.toshiba.com/taec/components/Generic/TMPR3922.shtml */ | 57 | /* http://www.madingley.org/james/resources/toshoboe/TMPR3922.pdf */ |
58 | /* The mapping between the registers in that document and the */ | 58 | /* The mapping between the registers in that document and the */ |
59 | /* Registers in the 701 oboe chip are as follows */ | 59 | /* Registers in the 701 oboe chip are as follows */ |
60 | 60 | ||
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 8dd03439d994..1766dc4f07e1 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -78,7 +78,7 @@ that almost all frames will need to be copied to an alignment buffer. | |||
78 | 78 | ||
79 | IVb. References | 79 | IVb. References |
80 | 80 | ||
81 | http://www.realtek.com.tw/cn/cn.html | 81 | http://www.realtek.com.tw/ |
82 | http://www.scyld.com/expert/NWay.html | 82 | http://www.scyld.com/expert/NWay.html |
83 | 83 | ||
84 | IVc. Errata | 84 | IVc. Errata |
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 2807a0fcadc4..321b12f82645 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -62,7 +62,7 @@ invalid ramWidth is Very Bad. | |||
62 | V. References | 62 | V. References |
63 | 63 | ||
64 | http://www.scyld.com/expert/NWay.html | 64 | http://www.scyld.com/expert/NWay.html |
65 | http://www.national.com/pf/DP/DP83840.html | 65 | http://www.national.com/opf/DP/DP83840A.html |
66 | 66 | ||
67 | Thanks to Terry Murphy of 3Com for providing development information for | 67 | Thanks to Terry Murphy of 3Com for providing development information for |
68 | earlier 3Com products. | 68 | earlier 3Com products. |
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 5526ab4895e6..5ecfa4b1e758 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -642,7 +642,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card) | |||
642 | status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0); | 642 | status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0); |
643 | if (status) | 643 | if (status) |
644 | dev_err(ctodev(card), | 644 | dev_err(ctodev(card), |
645 | "lv1_net_stop_rx_dma faild, %d\n", status); | 645 | "lv1_net_stop_rx_dma failed, %d\n", status); |
646 | } | 646 | } |
647 | 647 | ||
648 | /** | 648 | /** |
@@ -660,7 +660,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card) | |||
660 | status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0); | 660 | status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0); |
661 | if (status) | 661 | if (status) |
662 | dev_err(ctodev(card), | 662 | dev_err(ctodev(card), |
663 | "lv1_net_stop_tx_dma faild, status=%d\n", status); | 663 | "lv1_net_stop_tx_dma failed, status=%d\n", status); |
664 | } | 664 | } |
665 | 665 | ||
666 | /** | 666 | /** |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index d8249d7653c6..d96d2f7a3f14 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -95,7 +95,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); | |||
95 | #include <asm/sibyte/sb1250_regs.h> | 95 | #include <asm/sibyte/sb1250_regs.h> |
96 | #include <asm/sibyte/sb1250_int.h> | 96 | #include <asm/sibyte/sb1250_int.h> |
97 | #else | 97 | #else |
98 | #error invalid SiByte MAC configuation | 98 | #error invalid SiByte MAC configuration |
99 | #endif | 99 | #endif |
100 | #include <asm/sibyte/sb1250_scd.h> | 100 | #include <asm/sibyte/sb1250_scd.h> |
101 | #include <asm/sibyte/sb1250_mac.h> | 101 | #include <asm/sibyte/sb1250_mac.h> |
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); | |||
106 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) | 106 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) |
107 | #define UNIT_INT(n) (K_INT_MAC_0 + (n)) | 107 | #define UNIT_INT(n) (K_INT_MAC_0 + (n)) |
108 | #else | 108 | #else |
109 | #error invalid SiByte MAC configuation | 109 | #error invalid SiByte MAC configuration |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | #ifdef K_INT_PHY | 112 | #ifdef K_INT_PHY |
@@ -1568,7 +1568,7 @@ static void sbmac_channel_start(struct sbmac_softc *s) | |||
1568 | M_MAC_RX_ENABLE | | 1568 | M_MAC_RX_ENABLE | |
1569 | M_MAC_TX_ENABLE, s->sbm_macenable); | 1569 | M_MAC_TX_ENABLE, s->sbm_macenable); |
1570 | #else | 1570 | #else |
1571 | #error invalid SiByte MAC configuation | 1571 | #error invalid SiByte MAC configuration |
1572 | #endif | 1572 | #endif |
1573 | 1573 | ||
1574 | #ifdef CONFIG_SBMAC_COALESCE | 1574 | #ifdef CONFIG_SBMAC_COALESCE |
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index 31b92f5f32cb..417adf372828 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * Rewritten for 2.6 by Cesar Eduardo Barros | 15 | * Rewritten for 2.6 by Cesar Eduardo Barros |
16 | * | 16 | * |
17 | * A datasheet for this chip can be found at | 17 | * A datasheet for this chip can be found at |
18 | * http://www.silan.com.cn/english/products/pdf/SC92031AY.pdf | 18 | * http://www.silan.com.cn/english/product/pdf/SC92031AY.pdf |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* Note about set_mac_address: I don't know how to change the hardware | 21 | /* Note about set_mac_address: I don't know how to change the hardware |
diff --git a/drivers/net/skfp/hwt.c b/drivers/net/skfp/hwt.c index e6baa53307c7..c0798fd2ca69 100644 --- a/drivers/net/skfp/hwt.c +++ b/drivers/net/skfp/hwt.c | |||
@@ -221,7 +221,7 @@ u_long hwt_quick_read(struct s_smc *smc) | |||
221 | * para start start time | 221 | * para start start time |
222 | * duration time to wait | 222 | * duration time to wait |
223 | * | 223 | * |
224 | * NOTE: The fuction will return immediately, if the timer is not | 224 | * NOTE: The function will return immediately, if the timer is not |
225 | * started | 225 | * started |
226 | ************************/ | 226 | ************************/ |
227 | void hwt_wait_time(struct s_smc *smc, u_long start, long int duration) | 227 | void hwt_wait_time(struct s_smc *smc, u_long start, long int duration) |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index ba2e8339fe90..0a66fed52e8e 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * The driver architecture is based on the DEC FDDI driver by | 33 | * The driver architecture is based on the DEC FDDI driver by |
34 | * Lawrence V. Stefani and several ethernet drivers. | 34 | * Lawrence V. Stefani and several ethernet drivers. |
35 | * I also used an existing Windows NT miniport driver. | 35 | * I also used an existing Windows NT miniport driver. |
36 | * All hardware dependent fuctions are handled by the SysKonnect | 36 | * All hardware dependent functions are handled by the SysKonnect |
37 | * Hardware Module. | 37 | * Hardware Module. |
38 | * The only headerfiles that are directly related to this source | 38 | * The only headerfiles that are directly related to this source |
39 | * are skfddi.c, h/types.h, h/osdef1st.h, h/targetos.h. | 39 | * are skfddi.c, h/types.h, h/osdef1st.h, h/targetos.h. |
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index ec8c804a795d..f8e463cd8ecc 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -78,7 +78,7 @@ | |||
78 | * - Updated tlan.txt accordingly. | 78 | * - Updated tlan.txt accordingly. |
79 | * - Adjusted minimum/maximum frame length. | 79 | * - Adjusted minimum/maximum frame length. |
80 | * - There is now a TLAN website up at | 80 | * - There is now a TLAN website up at |
81 | * http://tlan.kernel.dk | 81 | * http://hp.sourceforge.net/ |
82 | * | 82 | * |
83 | * v1.7 April 07, 2000 - Started to implement custom ioctls. Driver now | 83 | * v1.7 April 07, 2000 - Started to implement custom ioctls. Driver now |
84 | * reports PHY information when used with Donald | 84 | * reports PHY information when used with Donald |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index c83f4f6e39e1..663b8860a531 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Originally sktr.c: Written 1997 by Christoph Goos | 5 | * Originally sktr.c: Written 1997 by Christoph Goos |
6 | * | 6 | * |
7 | * A fine result of the Linux Systems Network Architecture Project. | 7 | * A fine result of the Linux Systems Network Architecture Project. |
8 | * http://www.linux-sna.org | 8 | * http://www.vanheusden.com/sna/ |
9 | * | 9 | * |
10 | * This software may be used and distributed according to the terms | 10 | * This software may be used and distributed according to the terms |
11 | * of the GNU General Public License, incorporated herein by reference. | 11 | * of the GNU General Public License, incorporated herein by reference. |
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig index f3035951422f..1f8d4a8d8ea4 100644 --- a/drivers/net/tulip/Kconfig +++ b/drivers/net/tulip/Kconfig | |||
@@ -151,7 +151,7 @@ config ULI526X | |||
151 | select CRC32 | 151 | select CRC32 |
152 | ---help--- | 152 | ---help--- |
153 | This driver is for ULi M5261/M5263 10/100M Ethernet Controller | 153 | This driver is for ULi M5261/M5263 10/100M Ethernet Controller |
154 | (<http://www.uli.com.tw/>). | 154 | (<http://www.nvidia.com/page/uli_drivers.html>). |
155 | 155 | ||
156 | To compile this driver as a module, choose M here. The module will | 156 | To compile this driver as a module, choose M here. The module will |
157 | be called uli526x. | 157 | be called uli526x. |
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c index b8197666021e..4690c8e69207 100644 --- a/drivers/net/tulip/pnic2.c +++ b/drivers/net/tulip/pnic2.c | |||
@@ -59,7 +59,7 @@ | |||
59 | * Bit 14:12 - autonegotiation state (write 001 to start autonegotiate) | 59 | * Bit 14:12 - autonegotiation state (write 001 to start autonegotiate) |
60 | * Bit 3 - Autopolarity state | 60 | * Bit 3 - Autopolarity state |
61 | * Bit 2 - LS10B - link state of 10baseT 0 - good, 1 - failed | 61 | * Bit 2 - LS10B - link state of 10baseT 0 - good, 1 - failed |
62 | * Bit 1 - LS100B - link state of 100baseT 0 - good, 1- faild | 62 | * Bit 1 - LS100B - link state of 100baseT 0 - good, 1 - failed |
63 | * | 63 | * |
64 | * | 64 | * |
65 | * Data Port Selection Info | 65 | * Data Port Selection Info |
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c index 08555f8b15f4..08ad269f6b4e 100644 --- a/drivers/net/usb/plusb.c +++ b/drivers/net/usb/plusb.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | 33 | ||
34 | /* | 34 | /* |
35 | * Prolific PL-2301/PL-2302 driver ... http://www.prolifictech.com | 35 | * Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/ |
36 | * | 36 | * |
37 | * The protocol and handshaking used here should be bug-compatible | 37 | * The protocol and handshaking used here should be bug-compatible |
38 | * with the Linux 2.2 "plusb" driver, by Deti Fliegl. | 38 | * with the Linux 2.2 "plusb" driver, by Deti Fliegl. |
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index d08ce6a264cb..423eb26386c8 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig | |||
@@ -409,7 +409,7 @@ config CYCLADES_SYNC | |||
409 | tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" | 409 | tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" |
410 | depends on WAN_ROUTER_DRIVERS && (PCI || ISA) | 410 | depends on WAN_ROUTER_DRIVERS && (PCI || ISA) |
411 | ---help--- | 411 | ---help--- |
412 | Cyclom 2X from Cyclades Corporation <http://www.cyclades.com/> is an | 412 | Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an |
413 | intelligent multiprotocol WAN adapter with data transfer rates up to | 413 | intelligent multiprotocol WAN adapter with data transfer rates up to |
414 | 512 Kbps. These cards support the X.25 and SNA related protocols. | 414 | 512 Kbps. These cards support the X.25 and SNA related protocols. |
415 | 415 | ||
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c index 9937bbab938d..5d4bb615ccce 100644 --- a/drivers/net/wan/hdlc.c +++ b/drivers/net/wan/hdlc.c | |||
@@ -109,7 +109,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event, | |||
109 | return NOTIFY_DONE; /* not an HDLC device */ | 109 | return NOTIFY_DONE; /* not an HDLC device */ |
110 | 110 | ||
111 | if (event != NETDEV_CHANGE) | 111 | if (event != NETDEV_CHANGE) |
112 | return NOTIFY_DONE; /* Only interrested in carrier changes */ | 112 | return NOTIFY_DONE; /* Only interested in carrier changes */ |
113 | 113 | ||
114 | on = netif_carrier_ok(dev); | 114 | on = netif_carrier_ok(dev); |
115 | 115 | ||
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index 4a367cdb3eb9..308b79e1ff08 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -348,7 +348,7 @@ struct ath5k_srev_name { | |||
348 | /* | 348 | /* |
349 | * Some of this information is based on Documentation from: | 349 | * Some of this information is based on Documentation from: |
350 | * | 350 | * |
351 | * http://madwifi.org/wiki/ChipsetFeatures/SuperAG | 351 | * http://madwifi-project.org/wiki/ChipsetFeatures/SuperAG |
352 | * | 352 | * |
353 | * Modulation for Atheros' eXtended Range - range enhancing extension that is | 353 | * Modulation for Atheros' eXtended Range - range enhancing extension that is |
354 | * supposed to double the distance an Atheros client device can keep a | 354 | * supposed to double the distance an Atheros client device can keep a |
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h index a34929f06533..ca79ecd832fd 100644 --- a/drivers/net/wireless/ath/ath5k/reg.h +++ b/drivers/net/wireless/ath/ath5k/reg.h | |||
@@ -26,7 +26,6 @@ | |||
26 | * Atheros presentations and papers like these: | 26 | * Atheros presentations and papers like these: |
27 | * | 27 | * |
28 | * 5210 - http://nova.stanford.edu/~bbaas/ps/isscc2002_slides.pdf | 28 | * 5210 - http://nova.stanford.edu/~bbaas/ps/isscc2002_slides.pdf |
29 | * http://www.it.iitb.ac.in/~janak/wifire/01222734.pdf | ||
30 | * | 29 | * |
31 | * 5211 - http://www.hotchips.org/archives/hc14/3_Tue/16_mcfarland.pdf | 30 | * 5211 - http://www.hotchips.org/archives/hc14/3_Tue/16_mcfarland.pdf |
32 | * | 31 | * |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index e9d9d622a9b0..b7cb165d612b 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
@@ -2621,7 +2621,7 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) | |||
2621 | iface = netdev_priv(dev); | 2621 | iface = netdev_priv(dev); |
2622 | local = iface->local; | 2622 | local = iface->local; |
2623 | 2623 | ||
2624 | /* Detect early interrupt before driver is fully configued */ | 2624 | /* Detect early interrupt before driver is fully configured */ |
2625 | spin_lock(&local->irq_init_lock); | 2625 | spin_lock(&local->irq_init_lock); |
2626 | if (!dev->base_addr) { | 2626 | if (!dev->base_addr) { |
2627 | if (net_ratelimit()) { | 2627 | if (net_ratelimit()) { |
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig index e5f45cb2a7a2..25f965ffc889 100644 --- a/drivers/net/wireless/p54/Kconfig +++ b/drivers/net/wireless/p54/Kconfig | |||
@@ -9,7 +9,7 @@ config P54_COMMON | |||
9 | also need to be enabled in order to support any devices. | 9 | also need to be enabled in order to support any devices. |
10 | 10 | ||
11 | These devices require softmac firmware which can be found at | 11 | These devices require softmac firmware which can be found at |
12 | http://prism54.org/ | 12 | <http://wireless.kernel.org/en/users/Drivers/p54> |
13 | 13 | ||
14 | If you choose to build a module, it'll be called p54common. | 14 | If you choose to build a module, it'll be called p54common. |
15 | 15 | ||
@@ -21,7 +21,7 @@ config P54_USB | |||
21 | This driver is for USB isl38xx based wireless cards. | 21 | This driver is for USB isl38xx based wireless cards. |
22 | 22 | ||
23 | These devices require softmac firmware which can be found at | 23 | These devices require softmac firmware which can be found at |
24 | http://prism54.org/ | 24 | <http://wireless.kernel.org/en/users/Drivers/p54> |
25 | 25 | ||
26 | If you choose to build a module, it'll be called p54usb. | 26 | If you choose to build a module, it'll be called p54usb. |
27 | 27 | ||
@@ -35,7 +35,7 @@ config P54_PCI | |||
35 | supported by the fullmac driver/firmware. | 35 | supported by the fullmac driver/firmware. |
36 | 36 | ||
37 | This driver requires softmac firmware which can be found at | 37 | This driver requires softmac firmware which can be found at |
38 | http://prism54.org/ | 38 | <http://wireless.kernel.org/en/users/Drivers/p54> |
39 | 39 | ||
40 | If you choose to build a module, it'll be called p54pci. | 40 | If you choose to build a module, it'll be called p54pci. |
41 | 41 | ||
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c index dc14420a9adc..b5e64d71b7a6 100644 --- a/drivers/net/wireless/prism54/islpci_hotplug.c +++ b/drivers/net/wireless/prism54/islpci_hotplug.c | |||
@@ -38,7 +38,7 @@ module_param(init_pcitm, int, 0); | |||
38 | /* In this order: vendor, device, subvendor, subdevice, class, class_mask, | 38 | /* In this order: vendor, device, subvendor, subdevice, class, class_mask, |
39 | * driver_data | 39 | * driver_data |
40 | * If you have an update for this please contact prism54-devel@prism54.org | 40 | * If you have an update for this please contact prism54-devel@prism54.org |
41 | * The latest list can be found at http://prism54.org/supported_cards.php */ | 41 | * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */ |
42 | static DEFINE_PCI_DEVICE_TABLE(prism54_id_tbl) = { | 42 | static DEFINE_PCI_DEVICE_TABLE(prism54_id_tbl) = { |
43 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ | 43 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ |
44 | { | 44 | { |
diff --git a/drivers/parisc/README.dino b/drivers/parisc/README.dino index 097324f34bbe..1627426996c1 100644 --- a/drivers/parisc/README.dino +++ b/drivers/parisc/README.dino | |||
@@ -10,8 +10,7 @@ | |||
10 | ** PCI bus. HP-supplied graphics cards that utilize the PCI bus are | 10 | ** PCI bus. HP-supplied graphics cards that utilize the PCI bus are |
11 | ** not affected." | 11 | ** not affected." |
12 | ** | 12 | ** |
13 | ** REVISIT: "go/pci_defect" link below is stale. | 13 | ** http://h20000.www2.hp.com/bizsupport/TechSupport/Home.jsp?locale=en_US&prodTypeId=12454&prodSeriesId=44443 |
14 | ** HP Internal can use <http://hpfcdma.fc.hp.com:80/Dino/> | ||
15 | ** | 14 | ** |
16 | ** Product First Good Serial Number | 15 | ** Product First Good Serial Number |
17 | ** C200/C240 (US) US67350000 | 16 | ** C200/C240 (US) US67350000 |
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 0950fa40684f..8d62fb76cd41 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -2599,7 +2599,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, | |||
2599 | printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n"); | 2599 | printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n"); |
2600 | return 0; | 2600 | return 0; |
2601 | case 0x8: | 2601 | case 0x8: |
2602 | DPRINTK(KERN_DEBUG "parport_pc: ITE8874 found (2S)\n"); | 2602 | printk(KERN_INFO "parport_pc: ITE8874 found (2S)\n"); |
2603 | return 0; | 2603 | return 0; |
2604 | default: | 2604 | default: |
2605 | printk(KERN_INFO "parport_pc: unknown ITE887x\n"); | 2605 | printk(KERN_INFO "parport_pc: unknown ITE887x\n"); |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 857ae01734a6..cc96c7142dac 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -226,6 +226,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439TX, quir | |||
226 | * VIA Apollo KT133 needs PCI latency patch | 226 | * VIA Apollo KT133 needs PCI latency patch |
227 | * Made according to a windows driver based patch by George E. Breese | 227 | * Made according to a windows driver based patch by George E. Breese |
228 | * see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm | 228 | * see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm |
229 | * and http://www.georgebreese.com/net/software/#PCI | ||
229 | * Also see http://www.au-ja.org/review-kt133a-1-en.phtml for | 230 | * Also see http://www.au-ja.org/review-kt133a-1-en.phtml for |
230 | * the info on which Mr Breese based his work. | 231 | * the info on which Mr Breese based his work. |
231 | * | 232 | * |
@@ -1016,7 +1017,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA, 0x605, quirk_transparent_bridge) | |||
1016 | /* | 1017 | /* |
1017 | * Common misconfiguration of the MediaGX/Geode PCI master that will | 1018 | * Common misconfiguration of the MediaGX/Geode PCI master that will |
1018 | * reduce PCI bandwidth from 70MB/s to 25MB/s. See the GXM/GXLV/GX1 | 1019 | * reduce PCI bandwidth from 70MB/s to 25MB/s. See the GXM/GXLV/GX1 |
1019 | * datasheets found at http://www.national.com/ds/GX for info on what | 1020 | * datasheets found at http://www.national.com/analog for info on what |
1020 | * these bits do. <christer@weinigel.se> | 1021 | * these bits do. <christer@weinigel.se> |
1021 | */ | 1022 | */ |
1022 | static void quirk_mediagx_master(struct pci_dev *dev) | 1023 | static void quirk_mediagx_master(struct pci_dev *dev) |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 408dbaa080a1..9dc565c615bd 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -1072,7 +1072,7 @@ static void yenta_config_init(struct yenta_socket *socket) | |||
1072 | * invisible during PCI scans because of a misconfigured subordinate number | 1072 | * invisible during PCI scans because of a misconfigured subordinate number |
1073 | * of the parent brige - some BIOSes seem to be too lazy to set it right. | 1073 | * of the parent brige - some BIOSes seem to be too lazy to set it right. |
1074 | * Does the fixup carefully by checking how far it can go without conflicts. | 1074 | * Does the fixup carefully by checking how far it can go without conflicts. |
1075 | * See http\://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. | 1075 | * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information. |
1076 | */ | 1076 | */ |
1077 | static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) | 1077 | static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) |
1078 | { | 1078 | { |
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c index 2d8ac43f78e8..bc89f392a629 100644 --- a/drivers/pnp/pnpbios/proc.c +++ b/drivers/pnp/pnpbios/proc.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * | 11 | * |
12 | * The .../escd file is utilized by the lsescd utility written by | 12 | * The .../escd file is utilized by the lsescd utility written by |
13 | * Gunther Mayer. | 13 | * Gunther Mayer. |
14 | * http://home.t-online.de/home/gunther.mayer/lsescd | ||
15 | * | 14 | * |
16 | * The .../legacy_device_resources file is not used yet. | 15 | * The .../legacy_device_resources file is not used yet. |
17 | * | 16 | * |
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index 62de66af0a68..ddb0857e15a4 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c | |||
@@ -274,7 +274,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev) | |||
274 | nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev, | 274 | nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev, |
275 | &nuc900_rtc_ops, THIS_MODULE); | 275 | &nuc900_rtc_ops, THIS_MODULE); |
276 | if (IS_ERR(nuc900_rtc->rtcdev)) { | 276 | if (IS_ERR(nuc900_rtc->rtcdev)) { |
277 | dev_err(&pdev->dev, "rtc device register faild\n"); | 277 | dev_err(&pdev->dev, "rtc device register failed\n"); |
278 | err = PTR_ERR(nuc900_rtc->rtcdev); | 278 | err = PTR_ERR(nuc900_rtc->rtcdev); |
279 | goto fail3; | 279 | goto fail3; |
280 | } | 280 | } |
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 85bfd8794856..e82d427ff5eb 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
@@ -2197,7 +2197,7 @@ dasd_3990_erp_inspect_32(struct dasd_ccw_req * erp, char *sense) | |||
2197 | 2197 | ||
2198 | /* | 2198 | /* |
2199 | ***************************************************************************** | 2199 | ***************************************************************************** |
2200 | * main ERP control fuctions (24 and 32 byte sense) | 2200 | * main ERP control functions (24 and 32 byte sense) |
2201 | ***************************************************************************** | 2201 | ***************************************************************************** |
2202 | */ | 2202 | */ |
2203 | 2203 | ||
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 66360c24bd48..59b4ecfb967b 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
@@ -1190,7 +1190,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device) | |||
1190 | goto out_err2; | 1190 | goto out_err2; |
1191 | } | 1191 | } |
1192 | /* | 1192 | /* |
1193 | * dasd_eckd_vaildate_server is done on the first device that | 1193 | * dasd_eckd_validate_server is done on the first device that |
1194 | * is found for an LCU. All later other devices have to wait | 1194 | * is found for an LCU. All later other devices have to wait |
1195 | * for it, so they will read the correct feature codes. | 1195 | * for it, so they will read the correct feature codes. |
1196 | */ | 1196 | */ |
@@ -1216,7 +1216,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device) | |||
1216 | "Read device characteristic failed, rc=%d", rc); | 1216 | "Read device characteristic failed, rc=%d", rc); |
1217 | goto out_err3; | 1217 | goto out_err3; |
1218 | } | 1218 | } |
1219 | /* find the vaild cylinder size */ | 1219 | /* find the valid cylinder size */ |
1220 | if (private->rdc_data.no_cyl == LV_COMPAT_CYL && | 1220 | if (private->rdc_data.no_cyl == LV_COMPAT_CYL && |
1221 | private->rdc_data.long_no_cyl) | 1221 | private->rdc_data.long_no_cyl) |
1222 | private->real_cyl = private->rdc_data.long_no_cyl; | 1222 | private->real_cyl = private->rdc_data.long_no_cyl; |
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c index fc993acf99b6..deff2c3361e4 100644 --- a/drivers/s390/char/tape_3590.c +++ b/drivers/s390/char/tape_3590.c | |||
@@ -31,7 +31,7 @@ debug_info_t *TAPE_DBF_AREA = NULL; | |||
31 | EXPORT_SYMBOL(TAPE_DBF_AREA); | 31 | EXPORT_SYMBOL(TAPE_DBF_AREA); |
32 | 32 | ||
33 | /******************************************************************* | 33 | /******************************************************************* |
34 | * Error Recovery fuctions: | 34 | * Error Recovery functions: |
35 | * - Read Opposite: implemented | 35 | * - Read Opposite: implemented |
36 | * - Read Device (buffered) log: BRA | 36 | * - Read Device (buffered) log: BRA |
37 | * - Read Library log: BRA | 37 | * - Read Library log: BRA |
@@ -798,7 +798,7 @@ tape_3590_done(struct tape_device *device, struct tape_request *request) | |||
798 | } | 798 | } |
799 | 799 | ||
800 | /* | 800 | /* |
801 | * This fuction is called, when error recovery was successfull | 801 | * This function is called, when error recovery was successful |
802 | */ | 802 | */ |
803 | static inline int | 803 | static inline int |
804 | tape_3590_erp_succeded(struct tape_device *device, struct tape_request *request) | 804 | tape_3590_erp_succeded(struct tape_device *device, struct tape_request *request) |
@@ -809,7 +809,7 @@ tape_3590_erp_succeded(struct tape_device *device, struct tape_request *request) | |||
809 | } | 809 | } |
810 | 810 | ||
811 | /* | 811 | /* |
812 | * This fuction is called, when error recovery was not successfull | 812 | * This function is called, when error recovery was not successful |
813 | */ | 813 | */ |
814 | static inline int | 814 | static inline int |
815 | tape_3590_erp_failed(struct tape_device *device, struct tape_request *request, | 815 | tape_3590_erp_failed(struct tape_device *device, struct tape_request *request, |
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 0e7cb1a84151..31a3ccbb6495 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c | |||
@@ -47,7 +47,7 @@ static int vmcp_release(struct inode *inode, struct file *file) | |||
47 | { | 47 | { |
48 | struct vmcp_session *session; | 48 | struct vmcp_session *session; |
49 | 49 | ||
50 | session = (struct vmcp_session *)file->private_data; | 50 | session = file->private_data; |
51 | file->private_data = NULL; | 51 | file->private_data = NULL; |
52 | free_pages((unsigned long)session->response, get_order(session->bufsize)); | 52 | free_pages((unsigned long)session->response, get_order(session->bufsize)); |
53 | kfree(session); | 53 | kfree(session); |
@@ -94,7 +94,7 @@ vmcp_write(struct file *file, const char __user *buff, size_t count, | |||
94 | return -EFAULT; | 94 | return -EFAULT; |
95 | } | 95 | } |
96 | cmd[count] = '\0'; | 96 | cmd[count] = '\0'; |
97 | session = (struct vmcp_session *)file->private_data; | 97 | session = file->private_data; |
98 | if (mutex_lock_interruptible(&session->mutex)) { | 98 | if (mutex_lock_interruptible(&session->mutex)) { |
99 | kfree(cmd); | 99 | kfree(cmd); |
100 | return -ERESTARTSYS; | 100 | return -ERESTARTSYS; |
@@ -136,7 +136,7 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
136 | int __user *argp; | 136 | int __user *argp; |
137 | int temp; | 137 | int temp; |
138 | 138 | ||
139 | session = (struct vmcp_session *)file->private_data; | 139 | session = file->private_data; |
140 | if (is_compat_task()) | 140 | if (is_compat_task()) |
141 | argp = compat_ptr(arg); | 141 | argp = compat_ptr(arg); |
142 | else | 142 | else |
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 2e9632e2c98b..8616496ffc02 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -116,7 +116,7 @@ config CHR_DEV_OSST | |||
116 | <http://www.tldp.org/docs.html#howto> and | 116 | <http://www.tldp.org/docs.html#howto> and |
117 | <file:Documentation/scsi/osst.txt> in the kernel source. | 117 | <file:Documentation/scsi/osst.txt> in the kernel source. |
118 | More info on the OnStream driver may be found on | 118 | More info on the OnStream driver may be found on |
119 | <http://linux1.onstream.nl/test/> | 119 | <http://sourceforge.net/projects/osst/> |
120 | Please also have a look at the standard st docu, as most of it | 120 | Please also have a look at the standard st docu, as most of it |
121 | applies to osst as well. | 121 | applies to osst as well. |
122 | 122 | ||
@@ -156,9 +156,9 @@ config CHR_DEV_SG | |||
156 | directly, so you need some additional software which knows how to | 156 | directly, so you need some additional software which knows how to |
157 | talk to these devices using the SCSI protocol: | 157 | talk to these devices using the SCSI protocol: |
158 | 158 | ||
159 | For scanners, look at SANE (<http://www.mostang.com/sane/>). For CD | 159 | For scanners, look at SANE (<http://www.sane-project.org/>). For CD |
160 | writer software look at Cdrtools | 160 | writer software look at Cdrtools |
161 | (<http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html>) | 161 | (<http://cdrecord.berlios.de/private/cdrecord.html>) |
162 | and for burning a "disk at once": CDRDAO | 162 | and for burning a "disk at once": CDRDAO |
163 | (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high | 163 | (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high |
164 | quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>). | 164 | quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>). |
@@ -951,6 +951,7 @@ config SCSI_IPS | |||
951 | ---help--- | 951 | ---help--- |
952 | This is support for the IBM ServeRAID hardware RAID controllers. | 952 | This is support for the IBM ServeRAID hardware RAID controllers. |
953 | See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html> | 953 | See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html> |
954 | and <http://www-947.ibm.com/support/entry/portal/docdisplay?brand=5000008&lndocid=SERV-RAID> | ||
954 | for more information. If this driver does not work correctly | 955 | for more information. If this driver does not work correctly |
955 | without modification please contact the author by email at | 956 | without modification please contact the author by email at |
956 | <ipslinux@adaptec.com>. | 957 | <ipslinux@adaptec.com>. |
@@ -1610,7 +1611,7 @@ config SCSI_DEBUG | |||
1610 | host adapter with one dummy SCSI disk. Each dummy disk uses kernel | 1611 | host adapter with one dummy SCSI disk. Each dummy disk uses kernel |
1611 | RAM as storage (i.e. it is a ramdisk). To save space when multiple | 1612 | RAM as storage (i.e. it is a ramdisk). To save space when multiple |
1612 | dummy disks are simulated, they share the same kernel RAM for | 1613 | dummy disks are simulated, they share the same kernel RAM for |
1613 | their storage. See <http://www.torque.net/sg/sdebug.html> for more | 1614 | their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more |
1614 | information. This driver is primarily of use to those testing the | 1615 | information. This driver is primarily of use to those testing the |
1615 | SCSI and block subsystems. If unsure, say N. | 1616 | SCSI and block subsystems. If unsure, say N. |
1616 | 1617 | ||
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index dae46d779c7b..29c0ed1cf507 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -771,7 +771,7 @@ static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long | |||
771 | { | 771 | { |
772 | if (!capable(CAP_SYS_RAWIO)) | 772 | if (!capable(CAP_SYS_RAWIO)) |
773 | return -EPERM; | 773 | return -EPERM; |
774 | return aac_compat_do_ioctl((struct aac_dev *)file->private_data, cmd, arg); | 774 | return aac_compat_do_ioctl(file->private_data, cmd, arg); |
775 | } | 775 | } |
776 | #endif | 776 | #endif |
777 | 777 | ||
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index c3d7174e3469..a345dde16c86 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -5509,7 +5509,7 @@ lpfc_get_rec_conf23(uint8_t *buff, uint32_t size, uint8_t rec_type) | |||
5509 | * @buff: Buffer containing config region 23 data. | 5509 | * @buff: Buffer containing config region 23 data. |
5510 | * @size: Size of the data buffer. | 5510 | * @size: Size of the data buffer. |
5511 | * | 5511 | * |
5512 | * This fuction parse the FCoE config parameters in config region 23 and | 5512 | * This function parses the FCoE config parameters in config region 23 and |
5513 | * populate driver data structure with the parameters. | 5513 | * populate driver data structure with the parameters. |
5514 | */ | 5514 | */ |
5515 | void | 5515 | void |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 5428d53f5a13..909ed9ed24c0 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -212,7 +212,7 @@ static void sg_put_dev(Sg_device *sdp); | |||
212 | 212 | ||
213 | static int sg_allow_access(struct file *filp, unsigned char *cmd) | 213 | static int sg_allow_access(struct file *filp, unsigned char *cmd) |
214 | { | 214 | { |
215 | struct sg_fd *sfp = (struct sg_fd *)filp->private_data; | 215 | struct sg_fd *sfp = filp->private_data; |
216 | 216 | ||
217 | if (sfp->parentdp->device->type == TYPE_SCANNER) | 217 | if (sfp->parentdp->device->type == TYPE_SCANNER) |
218 | return 0; | 218 | return 0; |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 167c4a6ccbc3..4d8e14b7aa93 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -919,7 +919,7 @@ static int broken_efr(struct uart_8250_port *up) | |||
919 | /* | 919 | /* |
920 | * Exar ST16C2550 "A2" devices incorrectly detect as | 920 | * Exar ST16C2550 "A2" devices incorrectly detect as |
921 | * having an EFR, and report an ID of 0x0201. See | 921 | * having an EFR, and report an ID of 0x0201. See |
922 | * http://www.exar.com/info.php?pdf=dan180_oct2004.pdf | 922 | * http://linux.derkeiler.com/Mailing-Lists/Kernel/2004-11/4812.html |
923 | */ | 923 | */ |
924 | if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16) | 924 | if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16) |
925 | return 1; | 925 | return 1; |
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c index 6f1b51e231e4..e95c524d9d18 100644 --- a/drivers/serial/bfin_sport_uart.c +++ b/drivers/serial/bfin_sport_uart.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | /* | 11 | /* |
12 | * This driver and the hardware supported are in term of EE-191 of ADI. | 12 | * This driver and the hardware supported are in term of EE-191 of ADI. |
13 | * http://www.analog.com/UploadedFiles/Application_Notes/399447663EE191.pdf | 13 | * http://www.analog.com/static/imported-files/application_notes/EE191.pdf |
14 | * This application note describe how to implement a UART on a Sharc DSP, | 14 | * This application note describe how to implement a UART on a Sharc DSP, |
15 | * but this driver is implemented on Blackfin Processor. | 15 | * but this driver is implemented on Blackfin Processor. |
16 | * Transmit Frame Sync is not used by this driver to transfer data out. | 16 | * Transmit Frame Sync is not used by this driver to transfer data out. |
diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/serial/bfin_sport_uart.h index 9ce253e381d2..6d06ce1d5675 100644 --- a/drivers/serial/bfin_sport_uart.h +++ b/drivers/serial/bfin_sport_uart.h | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | /* | 11 | /* |
12 | * This driver and the hardware supported are in term of EE-191 of ADI. | 12 | * This driver and the hardware supported are in term of EE-191 of ADI. |
13 | * http://www.analog.com/UploadedFiles/Application_Notes/399447663EE191.pdf | 13 | * http://www.analog.com/static/imported-files/application_notes/EE191.pdf |
14 | * This application note describe how to implement a UART on a Sharc DSP, | 14 | * This application note describe how to implement a UART on a Sharc DSP, |
15 | * but this driver is implemented on Blackfin Processor. | 15 | * but this driver is implemented on Blackfin Processor. |
16 | * Transmit Frame Sync is not used by this driver to transfer data out. | 16 | * Transmit Frame Sync is not used by this driver to transfer data out. |
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index c4bf54bb3fc7..d2fce865b731 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(of, ulite_of_match); | |||
44 | * Register definitions | 44 | * Register definitions |
45 | * | 45 | * |
46 | * For register details see datasheet: | 46 | * For register details see datasheet: |
47 | * http://www.xilinx.com/bvdocs/ipcenter/data_sheet/opb_uartlite.pdf | 47 | * http://www.xilinx.com/support/documentation/ip_documentation/opb_uartlite.pdf |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #define ULITE_RX 0x00 | 50 | #define ULITE_RX 0x00 |
diff --git a/drivers/staging/asus_oled/README b/drivers/staging/asus_oled/README index 96b9717f168f..0d82a6d5fa58 100644 --- a/drivers/staging/asus_oled/README +++ b/drivers/staging/asus_oled/README | |||
@@ -2,7 +2,7 @@ | |||
2 | Driver for Asus OLED display present in some Asus laptops. | 2 | Driver for Asus OLED display present in some Asus laptops. |
3 | 3 | ||
4 | The code of this driver is based on 'asusoled' program taken from | 4 | The code of this driver is based on 'asusoled' program taken from |
5 | https://launchpad.net/asusoled/. I just wanted to have a simple | 5 | <http://lapsus.berlios.de/asus_oled.html>. I just wanted to have a simple |
6 | kernel driver for controlling this device, but I didn't know how | 6 | kernel driver for controlling this device, but I didn't know how |
7 | to do that. Now I know ;) Also, that program can not be used | 7 | to do that. Now I know ;) Also, that program can not be used |
8 | with usbhid loaded, which means no USB mouse/keyboard while | 8 | with usbhid loaded, which means no USB mouse/keyboard while |
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index 5b279fb30f3f..8c95d8c2a4f4 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * | 24 | * |
25 | * | 25 | * |
26 | * Asus OLED support is based on asusoled program taken from | 26 | * Asus OLED support is based on asusoled program taken from |
27 | * https://launchpad.net/asusoled/. | 27 | * <http://lapsus.berlios.de/asus_oled.html>. |
28 | * | 28 | * |
29 | * | 29 | * |
30 | */ | 30 | */ |
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index ced346a7cae3..78b1410ba4f6 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c | |||
@@ -37,7 +37,7 @@ Configuration Options: | |||
37 | Developed from cb_pcidas and skel by Richard Bytheway (mocelet@sucs.org). | 37 | Developed from cb_pcidas and skel by Richard Bytheway (mocelet@sucs.org). |
38 | Only supports DIO, AO and simple AI in it's present form. | 38 | Only supports DIO, AO and simple AI in it's present form. |
39 | No interrupts, multi channel or FIFO AI, although the card looks like it could support this. | 39 | No interrupts, multi channel or FIFO AI, although the card looks like it could support this. |
40 | See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more details. | 40 | See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details. |
41 | */ | 41 | */ |
42 | 42 | ||
43 | #include "../comedidev.h" | 43 | #include "../comedidev.h" |
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index 6af6c8323d56..82be77daa7d7 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c | |||
@@ -50,8 +50,8 @@ Configuration options: | |||
50 | With some help from our swedish distributor, we got the Windows sourcecode | 50 | With some help from our swedish distributor, we got the Windows sourcecode |
51 | for the card, and here are the findings so far. | 51 | for the card, and here are the findings so far. |
52 | 52 | ||
53 | 1. A good document that describes the PCI interface chip is found at: | 53 | 1. A good document that describes the PCI interface chip is 9080db-106.pdf |
54 | http://plx.plxtech.com/download/9080/databook/9080db-106.pdf | 54 | available from http://www.plxtech.com/products/io/pci9080 |
55 | 55 | ||
56 | 2. The initialization done so far is: | 56 | 2. The initialization done so far is: |
57 | a. program the FPGA (windows code sans a lot of error messages) | 57 | a. program the FPGA (windows code sans a lot of error messages) |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 3acf7e62bec4..1411dd8f4e7c 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -37,7 +37,7 @@ boards has not | |||
37 | yet been added to the driver, mainly due to the fact that | 37 | yet been added to the driver, mainly due to the fact that |
38 | I don't know the device id numbers. If you have one | 38 | I don't know the device id numbers. If you have one |
39 | of these boards, | 39 | of these boards, |
40 | please file a bug report at https://bugs.comedi.org/ | 40 | please file a bug report at http://comedi.org/ |
41 | so I can get the necessary information from you. | 41 | so I can get the necessary information from you. |
42 | 42 | ||
43 | The 1200 series boards have onboard calibration dacs for correcting | 43 | The 1200 series boards have onboard calibration dacs for correcting |
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index bd16f913af23..986ef6712989 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 340747b.pdf AT-MIO E series Register Level Programmer Manual | 34 | 340747b.pdf AT-MIO E series Register Level Programmer Manual |
35 | 341079b.pdf PCI E Series RLPM | 35 | 341079b.pdf PCI E Series RLPM |
36 | 340934b.pdf DAQ-STC reference manual | 36 | 340934b.pdf DAQ-STC reference manual |
37 | 67xx and 611x registers (from http://www.ni.com/pdf/daq/us) | 37 | 67xx and 611x registers (from ftp://ftp.ni.com/support/daq/mhddk/documentation/) |
38 | release_ni611x.pdf | 38 | release_ni611x.pdf |
39 | release_ni67xx.pdf | 39 | release_ni67xx.pdf |
40 | Other possibly relevant info: | 40 | Other possibly relevant info: |
diff --git a/drivers/staging/comedi/drivers/plx9080.h b/drivers/staging/comedi/drivers/plx9080.h index 485d63f99293..0d254a1b78a7 100644 --- a/drivers/staging/comedi/drivers/plx9080.h +++ b/drivers/staging/comedi/drivers/plx9080.h | |||
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | ******************************************************************** | 14 | ******************************************************************** |
15 | * | 15 | * |
16 | * Copyright (C) 1999 RG Studio s.c., http://www.rgstudio.com.pl/ | 16 | * Copyright (C) 1999 RG Studio s.c. |
17 | * Written by Krzysztof Halasa <khc@rgstudio.com.pl> | 17 | * Written by Krzysztof Halasa <khc@rgstudio.com.pl> |
18 | * | 18 | * |
19 | * Portions (C) SBE Inc., used by permission. | 19 | * Portions (C) SBE Inc., used by permission. |
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 0367d2b9e2fa..a49a7c566d37 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -59,7 +59,7 @@ Configuration options: | |||
59 | Data sheet: http://www.rtdusa.com/pdf/dm7520.pdf | 59 | Data sheet: http://www.rtdusa.com/pdf/dm7520.pdf |
60 | Example source: http://www.rtdusa.com/examples/dm/dm7520.zip | 60 | Example source: http://www.rtdusa.com/examples/dm/dm7520.zip |
61 | Call them and ask for the register level manual. | 61 | Call them and ask for the register level manual. |
62 | PCI chip: http://www.plxtech.com/products/toolbox/9080.htm | 62 | PCI chip: http://www.plxtech.com/products/io/pci9080 |
63 | 63 | ||
64 | Notes: | 64 | Notes: |
65 | This board is memory mapped. There is some IO stuff, but it isn't needed. | 65 | This board is memory mapped. There is some IO stuff, but it isn't needed. |
diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index 66122479d529..ba8f670ec0a7 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c | |||
@@ -5,8 +5,7 @@ | |||
5 | * Copyright (C) 2007-2010 Angelo Arrifano <miknix@gmail.com> | 5 | * Copyright (C) 2007-2010 Angelo Arrifano <miknix@gmail.com> |
6 | * | 6 | * |
7 | * Information gathered from disassebled dsdt and from here: | 7 | * Information gathered from disassebled dsdt and from here: |
8 | * "http://download.microsoft.com/download/9/c/5/ | 8 | * <http://www.microsoft.com/whdc/system/platform/firmware/DirAppLaunch.mspx> |
9 | * 9c5b2167-8017-4bae-9fde-d599bac8184a/DirAppLaunch_Vista.doc" | ||
10 | * | 9 | * |
11 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig index 1da73ecd9799..bb440792a1b7 100644 --- a/drivers/uio/Kconfig +++ b/drivers/uio/Kconfig | |||
@@ -17,9 +17,9 @@ config UIO_CIF | |||
17 | depends on PCI | 17 | depends on PCI |
18 | help | 18 | help |
19 | Driver for Hilscher CIF DeviceNet and Profibus cards. This | 19 | Driver for Hilscher CIF DeviceNet and Profibus cards. This |
20 | driver requires a userspace component that handles all of the | 20 | driver requires a userspace component called cif that handles |
21 | heavy lifting and can be found at: | 21 | all of the heavy lifting and can be found at: |
22 | http://www.osadl.org/projects/downloads/UIO/user/cif-* | 22 | <http://www.osadl.org/projects/downloads/UIO/user/> |
23 | 23 | ||
24 | To compile this driver as a module, choose M here: the module | 24 | To compile this driver as a module, choose M here: the module |
25 | will be called uio_cif. | 25 | will be called uio_cif. |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 387e503b9d14..bdec36acd0fa 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1266,7 +1266,6 @@ write_in: | |||
1266 | csr |= AT91_UDP_TXPKTRDY; | 1266 | csr |= AT91_UDP_TXPKTRDY; |
1267 | __raw_writel(csr, creg); | 1267 | __raw_writel(csr, creg); |
1268 | udc->req_pending = 0; | 1268 | udc->req_pending = 0; |
1269 | return; | ||
1270 | } | 1269 | } |
1271 | 1270 | ||
1272 | static void handle_ep0(struct at91_udc *udc) | 1271 | static void handle_ep0(struct at91_udc *udc) |
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 1f48ceb55a77..00975ed903d1 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c | |||
@@ -317,8 +317,6 @@ static void f_audio_playback_work(struct work_struct *data) | |||
317 | 317 | ||
318 | u_audio_playback(&audio->card, play_buf->buf, play_buf->actual); | 318 | u_audio_playback(&audio->card, play_buf->buf, play_buf->actual); |
319 | f_audio_buffer_free(play_buf); | 319 | f_audio_buffer_free(play_buf); |
320 | |||
321 | return; | ||
322 | } | 320 | } |
323 | 321 | ||
324 | static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req) | 322 | static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req) |
diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/f_hid.c index 2b98bd26364b..4f891eddd060 100644 --- a/drivers/usb/gadget/f_hid.c +++ b/drivers/usb/gadget/f_hid.c | |||
@@ -318,8 +318,6 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) | |||
318 | spin_unlock(&hidg->spinlock); | 318 | spin_unlock(&hidg->spinlock); |
319 | 319 | ||
320 | wake_up(&hidg->read_queue); | 320 | wake_up(&hidg->read_queue); |
321 | |||
322 | return; | ||
323 | } | 321 | } |
324 | 322 | ||
325 | static int hidg_setup(struct usb_function *f, | 323 | static int hidg_setup(struct usb_function *f, |
@@ -413,8 +411,6 @@ static void hidg_disable(struct usb_function *f) | |||
413 | 411 | ||
414 | usb_ep_disable(hidg->in_ep); | 412 | usb_ep_disable(hidg->in_ep); |
415 | hidg->in_ep->driver_data = NULL; | 413 | hidg->in_ep->driver_data = NULL; |
416 | |||
417 | return; | ||
418 | } | 414 | } |
419 | 415 | ||
420 | static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) | 416 | static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) |
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index c16b402a876b..4c55eda4bd20 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c | |||
@@ -287,8 +287,6 @@ static void dr_controller_run(struct fsl_udc *udc) | |||
287 | temp = fsl_readl(&dr_regs->usbcmd); | 287 | temp = fsl_readl(&dr_regs->usbcmd); |
288 | temp |= USB_CMD_RUN_STOP; | 288 | temp |= USB_CMD_RUN_STOP; |
289 | fsl_writel(temp, &dr_regs->usbcmd); | 289 | fsl_writel(temp, &dr_regs->usbcmd); |
290 | |||
291 | return; | ||
292 | } | 290 | } |
293 | 291 | ||
294 | static void dr_controller_stop(struct fsl_udc *udc) | 292 | static void dr_controller_stop(struct fsl_udc *udc) |
@@ -308,8 +306,6 @@ static void dr_controller_stop(struct fsl_udc *udc) | |||
308 | tmp = fsl_readl(&dr_regs->usbcmd); | 306 | tmp = fsl_readl(&dr_regs->usbcmd); |
309 | tmp &= ~USB_CMD_RUN_STOP; | 307 | tmp &= ~USB_CMD_RUN_STOP; |
310 | fsl_writel(tmp, &dr_regs->usbcmd); | 308 | fsl_writel(tmp, &dr_regs->usbcmd); |
311 | |||
312 | return; | ||
313 | } | 309 | } |
314 | 310 | ||
315 | static void dr_ep_setup(unsigned char ep_num, unsigned char dir, | 311 | static void dr_ep_setup(unsigned char ep_num, unsigned char dir, |
@@ -416,8 +412,6 @@ static void struct_ep_qh_setup(struct fsl_udc *udc, unsigned char ep_num, | |||
416 | p_QH->max_pkt_length = cpu_to_le32(tmp); | 412 | p_QH->max_pkt_length = cpu_to_le32(tmp); |
417 | p_QH->next_dtd_ptr = 1; | 413 | p_QH->next_dtd_ptr = 1; |
418 | p_QH->size_ioc_int_sts = 0; | 414 | p_QH->size_ioc_int_sts = 0; |
419 | |||
420 | return; | ||
421 | } | 415 | } |
422 | 416 | ||
423 | /* Setup qh structure and ep register for ep0. */ | 417 | /* Setup qh structure and ep register for ep0. */ |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 027d66f81620..2efd6732d130 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -1394,8 +1394,6 @@ static void pxa_ep_fifo_flush(struct usb_ep *_ep) | |||
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | spin_unlock_irqrestore(&ep->lock, flags); | 1396 | spin_unlock_irqrestore(&ep->lock, flags); |
1397 | |||
1398 | return; | ||
1399 | } | 1397 | } |
1400 | 1398 | ||
1401 | /** | 1399 | /** |
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 5b314041dfa9..d3cdffea9c8a 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
@@ -918,8 +918,6 @@ void rndis_deregister(int configNr) | |||
918 | 918 | ||
919 | if (configNr >= RNDIS_MAX_CONFIGS) return; | 919 | if (configNr >= RNDIS_MAX_CONFIGS) return; |
920 | rndis_per_dev_params[configNr].used = 0; | 920 | rndis_per_dev_params[configNr].used = 0; |
921 | |||
922 | return; | ||
923 | } | 921 | } |
924 | 922 | ||
925 | int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter) | 923 | int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter) |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 15fe3ecd203b..2adae8e39bba 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1095,7 +1095,6 @@ nogood: | |||
1095 | ep->hcpriv = NULL; | 1095 | ep->hcpriv = NULL; |
1096 | done: | 1096 | done: |
1097 | spin_unlock_irqrestore (&ehci->lock, flags); | 1097 | spin_unlock_irqrestore (&ehci->lock, flags); |
1098 | return; | ||
1099 | } | 1098 | } |
1100 | 1099 | ||
1101 | static void | 1100 | static void |
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index 1dfb2c8f7707..e49b75a78000 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
@@ -27,8 +27,8 @@ | |||
27 | * * 32 transfer descriptors (called ETDs) | 27 | * * 32 transfer descriptors (called ETDs) |
28 | * * 4Kb of Data memory | 28 | * * 4Kb of Data memory |
29 | * | 29 | * |
30 | * The data memory is shared between the host and fuction controlers | 30 | * The data memory is shared between the host and function controllers |
31 | * (but this driver only supports the host controler) | 31 | * (but this driver only supports the host controller) |
32 | * | 32 | * |
33 | * So setting up a transfer involves: | 33 | * So setting up a transfer involves: |
34 | * * Allocating a ETD | 34 | * * Allocating a ETD |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 3b5785032a10..f3713f43f3fe 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -370,7 +370,6 @@ sanitize: | |||
370 | } | 370 | } |
371 | ep->hcpriv = NULL; | 371 | ep->hcpriv = NULL; |
372 | spin_unlock_irqrestore (&ohci->lock, flags); | 372 | spin_unlock_irqrestore (&ohci->lock, flags); |
373 | return; | ||
374 | } | 373 | } |
375 | 374 | ||
376 | static int ohci_get_frame (struct usb_hcd *hcd) | 375 | static int ohci_get_frame (struct usb_hcd *hcd) |
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index d32c3eae99cb..32149be4ad8e 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
@@ -544,8 +544,6 @@ static void oxu_buf_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd) | |||
544 | qtd->buffer = NULL; | 544 | qtd->buffer = NULL; |
545 | 545 | ||
546 | spin_unlock(&oxu->mem_lock); | 546 | spin_unlock(&oxu->mem_lock); |
547 | |||
548 | return; | ||
549 | } | 547 | } |
550 | 548 | ||
551 | static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma) | 549 | static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma) |
@@ -571,8 +569,6 @@ static inline void oxu_qtd_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd) | |||
571 | oxu->qtd_used[index] = 0; | 569 | oxu->qtd_used[index] = 0; |
572 | 570 | ||
573 | spin_unlock(&oxu->mem_lock); | 571 | spin_unlock(&oxu->mem_lock); |
574 | |||
575 | return; | ||
576 | } | 572 | } |
577 | 573 | ||
578 | static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu) | 574 | static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu) |
@@ -615,8 +611,6 @@ static void oxu_qh_free(struct oxu_hcd *oxu, struct ehci_qh *qh) | |||
615 | oxu->qh_used[index] = 0; | 611 | oxu->qh_used[index] = 0; |
616 | 612 | ||
617 | spin_unlock(&oxu->mem_lock); | 613 | spin_unlock(&oxu->mem_lock); |
618 | |||
619 | return; | ||
620 | } | 614 | } |
621 | 615 | ||
622 | static void qh_destroy(struct kref *kref) | 616 | static void qh_destroy(struct kref *kref) |
@@ -693,8 +687,6 @@ static void oxu_murb_free(struct oxu_hcd *oxu, struct oxu_murb *murb) | |||
693 | oxu->murb_used[index] = 0; | 687 | oxu->murb_used[index] = 0; |
694 | 688 | ||
695 | spin_unlock(&oxu->mem_lock); | 689 | spin_unlock(&oxu->mem_lock); |
696 | |||
697 | return; | ||
698 | } | 690 | } |
699 | 691 | ||
700 | static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu) | 692 | static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu) |
@@ -3070,7 +3062,6 @@ nogood: | |||
3070 | ep->hcpriv = NULL; | 3062 | ep->hcpriv = NULL; |
3071 | done: | 3063 | done: |
3072 | spin_unlock_irqrestore(&oxu->lock, flags); | 3064 | spin_unlock_irqrestore(&oxu->lock, flags); |
3073 | return; | ||
3074 | } | 3065 | } |
3075 | 3066 | ||
3076 | static int oxu_get_frame(struct usb_hcd *hcd) | 3067 | static int oxu_get_frame(struct usb_hcd *hcd) |
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 464ed977b45d..4c502c890ebd 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
@@ -342,8 +342,6 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
342 | writel(0x3f, op_reg_base + EHCI_USBSTS); | 342 | writel(0x3f, op_reg_base + EHCI_USBSTS); |
343 | 343 | ||
344 | iounmap(base); | 344 | iounmap(base); |
345 | |||
346 | return; | ||
347 | } | 345 | } |
348 | 346 | ||
349 | /* | 347 | /* |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 5b31bae92dbc..fab764946c74 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -316,7 +316,6 @@ static void u132_ring_requeue_work(struct u132 *u132, struct u132_ring *ring, | |||
316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) | 316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) |
317 | return; | 317 | return; |
318 | kref_put(&u132->kref, u132_hcd_delete); | 318 | kref_put(&u132->kref, u132_hcd_delete); |
319 | return; | ||
320 | } | 319 | } |
321 | 320 | ||
322 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | 321 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, |
@@ -324,7 +323,6 @@ static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | |||
324 | { | 323 | { |
325 | kref_get(&u132->kref); | 324 | kref_get(&u132->kref); |
326 | u132_ring_requeue_work(u132, ring, delta); | 325 | u132_ring_requeue_work(u132, ring, delta); |
327 | return; | ||
328 | } | 326 | } |
329 | 327 | ||
330 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) | 328 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) |
@@ -543,7 +541,6 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp, | |||
543 | mutex_unlock(&u132->scheduler_lock); | 541 | mutex_unlock(&u132->scheduler_lock); |
544 | u132_endp_put_kref(u132, endp); | 542 | u132_endp_put_kref(u132, endp); |
545 | usb_hcd_giveback_urb(hcd, urb, status); | 543 | usb_hcd_giveback_urb(hcd, urb, status); |
546 | return; | ||
547 | } | 544 | } |
548 | 545 | ||
549 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, | 546 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, |
@@ -574,8 +571,8 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp, | |||
574 | endp->active = 0; | 571 | endp->active = 0; |
575 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); | 572 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); |
576 | kfree(urbq); | 573 | kfree(urbq); |
577 | } usb_hcd_giveback_urb(hcd, urb, status); | 574 | } |
578 | return; | 575 | usb_hcd_giveback_urb(hcd, urb, status); |
579 | } | 576 | } |
580 | 577 | ||
581 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, | 578 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, |
@@ -3085,7 +3082,6 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev) | |||
3085 | u132->endp[endps] = NULL; | 3082 | u132->endp[endps] = NULL; |
3086 | 3083 | ||
3087 | mutex_unlock(&u132->sw_lock); | 3084 | mutex_unlock(&u132->sw_lock); |
3088 | return; | ||
3089 | } | 3085 | } |
3090 | 3086 | ||
3091 | static int __devinit u132_probe(struct platform_device *pdev) | 3087 | static int __devinit u132_probe(struct platform_device *pdev) |
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 3a6bcd5fee09..5a47805d9580 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
@@ -398,7 +398,6 @@ void mts_int_submit_urb (struct urb* transfer, | |||
398 | context->srb->result = DID_ERROR << 16; | 398 | context->srb->result = DID_ERROR << 16; |
399 | mts_transfer_cleanup(transfer); | 399 | mts_transfer_cleanup(transfer); |
400 | } | 400 | } |
401 | return; | ||
402 | } | 401 | } |
403 | 402 | ||
404 | 403 | ||
@@ -409,7 +408,6 @@ static void mts_transfer_cleanup( struct urb *transfer ) | |||
409 | 408 | ||
410 | if ( likely(context->final_callback != NULL) ) | 409 | if ( likely(context->final_callback != NULL) ) |
411 | context->final_callback(context->srb); | 410 | context->final_callback(context->srb); |
412 | |||
413 | } | 411 | } |
414 | 412 | ||
415 | static void mts_transfer_done( struct urb *transfer ) | 413 | static void mts_transfer_done( struct urb *transfer ) |
@@ -420,8 +418,6 @@ static void mts_transfer_done( struct urb *transfer ) | |||
420 | context->srb->result |= (unsigned)(*context->scsi_status)<<1; | 418 | context->srb->result |= (unsigned)(*context->scsi_status)<<1; |
421 | 419 | ||
422 | mts_transfer_cleanup(transfer); | 420 | mts_transfer_cleanup(transfer); |
423 | |||
424 | return; | ||
425 | } | 421 | } |
426 | 422 | ||
427 | 423 | ||
@@ -452,8 +448,6 @@ static void mts_data_done( struct urb* transfer ) | |||
452 | } | 448 | } |
453 | 449 | ||
454 | mts_get_status(transfer); | 450 | mts_get_status(transfer); |
455 | |||
456 | return; | ||
457 | } | 451 | } |
458 | 452 | ||
459 | 453 | ||
@@ -496,8 +490,6 @@ static void mts_command_done( struct urb *transfer ) | |||
496 | mts_get_status(transfer); | 490 | mts_get_status(transfer); |
497 | } | 491 | } |
498 | } | 492 | } |
499 | |||
500 | return; | ||
501 | } | 493 | } |
502 | 494 | ||
503 | static void mts_do_sg (struct urb* transfer) | 495 | static void mts_do_sg (struct urb* transfer) |
@@ -522,7 +514,6 @@ static void mts_do_sg (struct urb* transfer) | |||
522 | sg[context->fragment].length, | 514 | sg[context->fragment].length, |
523 | context->fragment + 1 == scsi_sg_count(context->srb) ? | 515 | context->fragment + 1 == scsi_sg_count(context->srb) ? |
524 | mts_data_done : mts_do_sg); | 516 | mts_data_done : mts_do_sg); |
525 | return; | ||
526 | } | 517 | } |
527 | 518 | ||
528 | static const u8 mts_read_image_sig[] = { 0x28, 00, 00, 00 }; | 519 | static const u8 mts_read_image_sig[] = { 0x28, 00, 00, 00 }; |
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index c8eec9c2d89e..7839c98fa742 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -456,7 +456,6 @@ static void ftdi_elan_cancel_targets(struct usb_ftdi *ftdi) | |||
456 | static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi) | 456 | static void ftdi_elan_kick_command_queue(struct usb_ftdi *ftdi) |
457 | { | 457 | { |
458 | ftdi_command_queue_work(ftdi, 0); | 458 | ftdi_command_queue_work(ftdi, 0); |
459 | return; | ||
460 | } | 459 | } |
461 | 460 | ||
462 | static void ftdi_elan_command_work(struct work_struct *work) | 461 | static void ftdi_elan_command_work(struct work_struct *work) |
@@ -483,7 +482,6 @@ static void ftdi_elan_command_work(struct work_struct *work) | |||
483 | static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi) | 482 | static void ftdi_elan_kick_respond_queue(struct usb_ftdi *ftdi) |
484 | { | 483 | { |
485 | ftdi_respond_queue_work(ftdi, 0); | 484 | ftdi_respond_queue_work(ftdi, 0); |
486 | return; | ||
487 | } | 485 | } |
488 | 486 | ||
489 | static void ftdi_elan_respond_work(struct work_struct *work) | 487 | static void ftdi_elan_respond_work(struct work_struct *work) |
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index 812dc288bb8c..10405119985c 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c | |||
@@ -90,7 +90,6 @@ static void mon_bus_submit(struct mon_bus *mbus, struct urb *urb) | |||
90 | r->rnf_submit(r->r_data, urb); | 90 | r->rnf_submit(r->r_data, urb); |
91 | } | 91 | } |
92 | spin_unlock_irqrestore(&mbus->lock, flags); | 92 | spin_unlock_irqrestore(&mbus->lock, flags); |
93 | return; | ||
94 | } | 93 | } |
95 | 94 | ||
96 | static void mon_submit(struct usb_bus *ubus, struct urb *urb) | 95 | static void mon_submit(struct usb_bus *ubus, struct urb *urb) |
@@ -117,7 +116,6 @@ static void mon_bus_submit_error(struct mon_bus *mbus, struct urb *urb, int erro | |||
117 | r->rnf_error(r->r_data, urb, error); | 116 | r->rnf_error(r->r_data, urb, error); |
118 | } | 117 | } |
119 | spin_unlock_irqrestore(&mbus->lock, flags); | 118 | spin_unlock_irqrestore(&mbus->lock, flags); |
120 | return; | ||
121 | } | 119 | } |
122 | 120 | ||
123 | static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) | 121 | static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 95058109f9fa..c2b29761fa98 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -176,7 +176,7 @@ config USB_SERIAL_VISOR | |||
176 | help | 176 | help |
177 | Say Y here if you want to connect to your HandSpring Visor, Palm | 177 | Say Y here if you want to connect to your HandSpring Visor, Palm |
178 | m500 or m505 through its USB docking station. See | 178 | m500 or m505 through its USB docking station. See |
179 | <http://usbvisor.sourceforge.net/> for more information on using this | 179 | <http://usbvisor.sourceforge.net/index.php3> for more information on using this |
180 | driver. | 180 | driver. |
181 | 181 | ||
182 | To compile this driver as a module, choose M here: the | 182 | To compile this driver as a module, choose M here: the |
@@ -289,7 +289,7 @@ config USB_SERIAL_KEYSPAN | |||
289 | and was developed with their support. You must also include | 289 | and was developed with their support. You must also include |
290 | firmware to support your particular device(s). | 290 | firmware to support your particular device(s). |
291 | 291 | ||
292 | See <http://misc.nu/hugh/keyspan.html> for more information. | 292 | See <http://blemings.org/hugh/keyspan.html> for more information. |
293 | 293 | ||
294 | To compile this driver as a module, choose M here: the | 294 | To compile this driver as a module, choose M here: the |
295 | module will be called keyspan. | 295 | module will be called keyspan. |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index f5d06746cc3b..2edf238b00b9 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -1320,8 +1320,6 @@ continue_read: | |||
1320 | cypress_set_dead(port); | 1320 | cypress_set_dead(port); |
1321 | } | 1321 | } |
1322 | } | 1322 | } |
1323 | |||
1324 | return; | ||
1325 | } /* cypress_read_int_callback */ | 1323 | } /* cypress_read_int_callback */ |
1326 | 1324 | ||
1327 | 1325 | ||
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 37b57c785cc7..89a9a5847803 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -2108,7 +2108,6 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
2108 | } | 2108 | } |
2109 | 2109 | ||
2110 | } | 2110 | } |
2111 | return; | ||
2112 | } | 2111 | } |
2113 | 2112 | ||
2114 | static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) | 2113 | static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index cf1aea1b9ee7..7dfe02f1fb6a 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -46,7 +46,7 @@ | |||
46 | #define FTDI_USINT_RS232_PID 0xb812 /* Navigator RS232 and CONFIG lines */ | 46 | #define FTDI_USINT_RS232_PID 0xb812 /* Navigator RS232 and CONFIG lines */ |
47 | 47 | ||
48 | /* OOCDlink by Joern Kaipf <joernk@web.de> | 48 | /* OOCDlink by Joern Kaipf <joernk@web.de> |
49 | * (http://www.joernonline.de/dw/doku.php?id=start&idx=projects:oocdlink) */ | 49 | * (http://www.joernonline.de/) */ |
50 | #define FTDI_OOCDLINK_PID 0xbaf8 /* Amontec JTAGkey */ | 50 | #define FTDI_OOCDLINK_PID 0xbaf8 /* Amontec JTAGkey */ |
51 | 51 | ||
52 | /* Luminary Micro Stellaris Boards, VID = FTDI_VID */ | 52 | /* Luminary Micro Stellaris Boards, VID = FTDI_VID */ |
@@ -336,7 +336,7 @@ | |||
336 | #define FTDI_PIEGROUP_PID 0xF208 /* Product Id */ | 336 | #define FTDI_PIEGROUP_PID 0xF208 /* Product Id */ |
337 | 337 | ||
338 | /* ACT Solutions HomePro ZWave interface | 338 | /* ACT Solutions HomePro ZWave interface |
339 | (http://www.act-solutions.com/HomePro.htm) */ | 339 | (http://www.act-solutions.com/HomePro-Product-Matrix.html) */ |
340 | #define FTDI_ACTZWAVE_PID 0xF2D0 | 340 | #define FTDI_ACTZWAVE_PID 0xF2D0 |
341 | 341 | ||
342 | /* | 342 | /* |
@@ -367,7 +367,7 @@ | |||
367 | #define FTDI_SUUNTO_SPORTS_PID 0xF680 /* Suunto Sports instrument */ | 367 | #define FTDI_SUUNTO_SPORTS_PID 0xF680 /* Suunto Sports instrument */ |
368 | 368 | ||
369 | /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */ | 369 | /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */ |
370 | /* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */ | 370 | /* http://www.usbuirt.com/ */ |
371 | #define FTDI_USB_UIRT_PID 0xF850 /* Product Id */ | 371 | #define FTDI_USB_UIRT_PID 0xF850 /* Product Id */ |
372 | 372 | ||
373 | /* CCS Inc. ICDU/ICDU40 product ID - | 373 | /* CCS Inc. ICDU/ICDU40 product ID - |
@@ -396,7 +396,7 @@ | |||
396 | */ | 396 | */ |
397 | #define FTDI_HE_TIRA1_PID 0xFA78 /* Tira-1 IR transceiver */ | 397 | #define FTDI_HE_TIRA1_PID 0xFA78 /* Tira-1 IR transceiver */ |
398 | 398 | ||
399 | /* Inside Accesso contactless reader (http://www.insidefr.com) */ | 399 | /* Inside Accesso contactless reader (http://www.insidecontactless.com/) */ |
400 | #define INSIDE_ACCESSO 0xFAD0 | 400 | #define INSIDE_ACCESSO 0xFAD0 |
401 | 401 | ||
402 | /* | 402 | /* |
@@ -635,14 +635,14 @@ | |||
635 | 635 | ||
636 | /* | 636 | /* |
637 | * JETI SPECTROMETER SPECBOS 1201 | 637 | * JETI SPECTROMETER SPECBOS 1201 |
638 | * http://www.jeti.com/products/sys/scb/scb1201.php | 638 | * http://www.jeti.com/cms/index.php/instruments/other-instruments/specbos-2101 |
639 | */ | 639 | */ |
640 | #define JETI_VID 0x0c6c | 640 | #define JETI_VID 0x0c6c |
641 | #define JETI_SPC1201_PID 0x04b2 | 641 | #define JETI_SPC1201_PID 0x04b2 |
642 | 642 | ||
643 | /* | 643 | /* |
644 | * FTDI USB UART chips used in construction projects from the | 644 | * FTDI USB UART chips used in construction projects from the |
645 | * Elektor Electronics magazine (http://elektor-electronics.co.uk) | 645 | * Elektor Electronics magazine (http://www.elektor.com/) |
646 | */ | 646 | */ |
647 | #define ELEKTOR_VID 0x0C7D | 647 | #define ELEKTOR_VID 0x0C7D |
648 | #define ELEKTOR_FT323R_PID 0x0005 /* RFID-Reader, issue 09-2006 */ | 648 | #define ELEKTOR_FT323R_PID 0x0005 /* RFID-Reader, issue 09-2006 */ |
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index a42b29a695b2..26710b189918 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
@@ -1264,7 +1264,6 @@ static void garmin_read_bulk_callback(struct urb *urb) | |||
1264 | garmin_data_p->flags &= ~FLAGS_BULK_IN_ACTIVE; | 1264 | garmin_data_p->flags &= ~FLAGS_BULK_IN_ACTIVE; |
1265 | spin_unlock_irqrestore(&garmin_data_p->lock, flags); | 1265 | spin_unlock_irqrestore(&garmin_data_p->lock, flags); |
1266 | } | 1266 | } |
1267 | return; | ||
1268 | } | 1267 | } |
1269 | 1268 | ||
1270 | 1269 | ||
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index a0ab78ada25e..cd769ef24f8a 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -1467,8 +1467,6 @@ static void edge_throttle(struct tty_struct *tty) | |||
1467 | if (status != 0) | 1467 | if (status != 0) |
1468 | return; | 1468 | return; |
1469 | } | 1469 | } |
1470 | |||
1471 | return; | ||
1472 | } | 1470 | } |
1473 | 1471 | ||
1474 | 1472 | ||
@@ -1775,8 +1773,6 @@ static void edge_break(struct tty_struct *tty, int break_state) | |||
1775 | dbg("%s - error sending break set/clear command.", | 1773 | dbg("%s - error sending break set/clear command.", |
1776 | __func__); | 1774 | __func__); |
1777 | } | 1775 | } |
1778 | |||
1779 | return; | ||
1780 | } | 1776 | } |
1781 | 1777 | ||
1782 | 1778 | ||
@@ -2047,7 +2043,6 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, | |||
2047 | dbg("%s - Unrecognized IOSP status code %u", __func__, code); | 2043 | dbg("%s - Unrecognized IOSP status code %u", __func__, code); |
2048 | break; | 2044 | break; |
2049 | } | 2045 | } |
2050 | return; | ||
2051 | } | 2046 | } |
2052 | 2047 | ||
2053 | 2048 | ||
@@ -2100,8 +2095,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 newMsr) | |||
2100 | 2095 | ||
2101 | /* Save the new modem status */ | 2096 | /* Save the new modem status */ |
2102 | edge_port->shadowMSR = newMsr & 0xf0; | 2097 | edge_port->shadowMSR = newMsr & 0xf0; |
2103 | |||
2104 | return; | ||
2105 | } | 2098 | } |
2106 | 2099 | ||
2107 | 2100 | ||
@@ -2148,8 +2141,6 @@ static void handle_new_lsr(struct edgeport_port *edge_port, __u8 lsrData, | |||
2148 | icount->parity++; | 2141 | icount->parity++; |
2149 | if (newLsr & LSR_FRM_ERR) | 2142 | if (newLsr & LSR_FRM_ERR) |
2150 | icount->frame++; | 2143 | icount->frame++; |
2151 | |||
2152 | return; | ||
2153 | } | 2144 | } |
2154 | 2145 | ||
2155 | 2146 | ||
@@ -2725,7 +2716,6 @@ static void change_port_settings(struct tty_struct *tty, | |||
2725 | baud = tty_termios_baud_rate(old_termios); | 2716 | baud = tty_termios_baud_rate(old_termios); |
2726 | tty_encode_baud_rate(tty, baud, baud); | 2717 | tty_encode_baud_rate(tty, baud, baud); |
2727 | } | 2718 | } |
2728 | return; | ||
2729 | } | 2719 | } |
2730 | 2720 | ||
2731 | 2721 | ||
@@ -2927,7 +2917,6 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) | |||
2927 | 0x40, 0x4000, 0x0001, NULL, 0, 3000); | 2917 | 0x40, 0x4000, 0x0001, NULL, 0, 3000); |
2928 | 2918 | ||
2929 | release_firmware(fw); | 2919 | release_firmware(fw); |
2930 | return; | ||
2931 | } | 2920 | } |
2932 | 2921 | ||
2933 | 2922 | ||
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 4dad27a0f22a..22506b095c4f 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -1571,8 +1571,6 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr) | |||
1571 | } | 1571 | } |
1572 | } | 1572 | } |
1573 | tty_kref_put(tty); | 1573 | tty_kref_put(tty); |
1574 | |||
1575 | return; | ||
1576 | } | 1574 | } |
1577 | 1575 | ||
1578 | static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data, | 1576 | static void handle_new_lsr(struct edgeport_port *edge_port, int lsr_data, |
@@ -2424,7 +2422,6 @@ static void change_port_settings(struct tty_struct *tty, | |||
2424 | dbg("%s - error %d when trying to write config to device", | 2422 | dbg("%s - error %d when trying to write config to device", |
2425 | __func__, status); | 2423 | __func__, status); |
2426 | kfree(config); | 2424 | kfree(config); |
2427 | return; | ||
2428 | } | 2425 | } |
2429 | 2426 | ||
2430 | static void edge_set_termios(struct tty_struct *tty, | 2427 | static void edge_set_termios(struct tty_struct *tty, |
@@ -2445,7 +2442,6 @@ static void edge_set_termios(struct tty_struct *tty, | |||
2445 | return; | 2442 | return; |
2446 | /* change the port settings to the new ones specified */ | 2443 | /* change the port settings to the new ones specified */ |
2447 | change_port_settings(tty, edge_port, old_termios); | 2444 | change_port_settings(tty, edge_port, old_termios); |
2448 | return; | ||
2449 | } | 2445 | } |
2450 | 2446 | ||
2451 | static int edge_tiocmset(struct tty_struct *tty, struct file *file, | 2447 | static int edge_tiocmset(struct tty_struct *tty, struct file *file, |
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index efc72113216b..12ed594f5f80 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
@@ -807,7 +807,6 @@ static void read_rxcmd_callback(struct urb *urb) | |||
807 | iuu_uart_read_callback, port); | 807 | iuu_uart_read_callback, port); |
808 | result = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 808 | result = usb_submit_urb(port->read_urb, GFP_ATOMIC); |
809 | dbg("%s - submit result = %d", __func__, result); | 809 | dbg("%s - submit result = %d", __func__, result); |
810 | return; | ||
811 | } | 810 | } |
812 | 811 | ||
813 | static int iuu_uart_on(struct usb_serial_port *port) | 812 | static int iuu_uart_on(struct usb_serial_port *port) |
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 297163c3c610..0791778a66f3 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
@@ -9,7 +9,7 @@ | |||
9 | the Free Software Foundation; either version 2 of the License, or | 9 | the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. | 10 | (at your option) any later version. |
11 | 11 | ||
12 | See http://misc.nu/hugh/keyspan.html for more information. | 12 | See http://blemings.org/hugh/keyspan.html for more information. |
13 | 13 | ||
14 | Code in this driver inspired by and in a number of places taken | 14 | Code in this driver inspired by and in a number of places taken |
15 | from Brian Warner's original Keyspan-PDA driver. | 15 | from Brian Warner's original Keyspan-PDA driver. |
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index bf3297ddd186..2d8baf6ac472 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
@@ -9,7 +9,7 @@ | |||
9 | the Free Software Foundation; either version 2 of the License, or | 9 | the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. | 10 | (at your option) any later version. |
11 | 11 | ||
12 | See http://misc.nu/hugh/keyspan.html for more information. | 12 | See http://blemings.org/hugh/keyspan.html for more information. |
13 | 13 | ||
14 | Code in this driver inspired by and in a number of places taken | 14 | Code in this driver inspired by and in a number of places taken |
15 | from Brian Warner's original Keyspan-PDA driver. | 15 | from Brian Warner's original Keyspan-PDA driver. |
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 185fe9a7d4e0..a10dd5676ccc 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
@@ -292,7 +292,6 @@ static void keyspan_pda_rx_unthrottle(struct tty_struct *tty) | |||
292 | port->interrupt_in_urb->dev = port->serial->dev; | 292 | port->interrupt_in_urb->dev = port->serial->dev; |
293 | if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL)) | 293 | if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL)) |
294 | dbg(" usb_submit_urb(read urb) failed"); | 294 | dbg(" usb_submit_urb(read urb) failed"); |
295 | return; | ||
296 | } | 295 | } |
297 | 296 | ||
298 | 297 | ||
diff --git a/drivers/usb/serial/mct_u232.h b/drivers/usb/serial/mct_u232.h index 3a3f5e6b8f96..d325bb8cb583 100644 --- a/drivers/usb/serial/mct_u232.h +++ b/drivers/usb/serial/mct_u232.h | |||
@@ -10,10 +10,9 @@ | |||
10 | * | 10 | * |
11 | * This driver is for the device MCT USB-RS232 Converter (25 pin, Model No. | 11 | * This driver is for the device MCT USB-RS232 Converter (25 pin, Model No. |
12 | * U232-P25) from Magic Control Technology Corp. (there is also a 9 pin | 12 | * U232-P25) from Magic Control Technology Corp. (there is also a 9 pin |
13 | * Model No. U232-P9). See http://www.mct.com.tw/p_u232.html for further | 13 | * Model No. U232-P9). See http://www.mct.com.tw/products/product_us232.html |
14 | * information. The properties of this device are listed at the end of this | 14 | * for further information. The properties of this device are listed at the end |
15 | * file. This device is available from various distributors. I know Hana, | 15 | * of this file. This device was used in the Dlink DSB-S25. |
16 | * http://www.hana.de and D-Link, http://www.dlink.com/products/usb/dsbs25. | ||
17 | * | 16 | * |
18 | * All of the information about the device was acquired by using SniffUSB | 17 | * All of the information about the device was acquired by using SniffUSB |
19 | * on Windows98. The technical details of the reverse engineering are | 18 | * on Windows98. The technical details of the reverse engineering are |
@@ -458,7 +457,7 @@ static int mct_u232_calculate_baud_rate(struct usb_serial *serial, | |||
458 | * embedded UART. Exhaustive documentation for these is available at: | 457 | * embedded UART. Exhaustive documentation for these is available at: |
459 | * | 458 | * |
460 | * http://www.semiconductors.philips.com/pip/p87c52ubaa | 459 | * http://www.semiconductors.philips.com/pip/p87c52ubaa |
461 | * http://www.semiconductors.philips.com/pip/pdiusbd12 | 460 | * http://www.nxp.com/acrobat_download/various/PDIUSBD12_PROGRAMMING_GUIDE.pdf |
462 | * | 461 | * |
463 | * Thanks to Julian Highfield for the pointer to the Philips database. | 462 | * Thanks to Julian Highfield for the pointer to the Philips database. |
464 | * | 463 | * |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index fd0b6414f459..7d3bc9a3e2b6 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -827,7 +827,6 @@ exit: | |||
827 | dev_err(&urb->dev->dev, | 827 | dev_err(&urb->dev->dev, |
828 | "%s - Error %d submitting control urb\n", | 828 | "%s - Error %d submitting control urb\n", |
829 | __func__, result); | 829 | __func__, result); |
830 | return; | ||
831 | } | 830 | } |
832 | 831 | ||
833 | /* | 832 | /* |
@@ -907,7 +906,6 @@ exit: | |||
907 | dev_err(&urb->dev->dev, | 906 | dev_err(&urb->dev->dev, |
908 | "%s - Error %d submitting control urb\n", | 907 | "%s - Error %d submitting control urb\n", |
909 | __func__, result); | 908 | __func__, result); |
910 | return; | ||
911 | } | 909 | } |
912 | 910 | ||
913 | /* | 911 | /* |
@@ -1227,8 +1225,6 @@ static void mos7720_break(struct tty_struct *tty, int break_state) | |||
1227 | mos7720_port->shadowLCR = data; | 1225 | mos7720_port->shadowLCR = data; |
1228 | write_mos_reg(serial, port->number - port->serial->minor, | 1226 | write_mos_reg(serial, port->number - port->serial->minor, |
1229 | LCR, mos7720_port->shadowLCR); | 1227 | LCR, mos7720_port->shadowLCR); |
1230 | |||
1231 | return; | ||
1232 | } | 1228 | } |
1233 | 1229 | ||
1234 | /* | 1230 | /* |
@@ -1746,7 +1742,6 @@ static void change_port_settings(struct tty_struct *tty, | |||
1746 | dbg("usb_submit_urb(read bulk) failed, status = %d", | 1742 | dbg("usb_submit_urb(read bulk) failed, status = %d", |
1747 | status); | 1743 | status); |
1748 | } | 1744 | } |
1749 | return; | ||
1750 | } | 1745 | } |
1751 | 1746 | ||
1752 | /* | 1747 | /* |
@@ -1803,7 +1798,6 @@ static void mos7720_set_termios(struct tty_struct *tty, | |||
1803 | dbg("usb_submit_urb(read bulk) failed, status = %d", | 1798 | dbg("usb_submit_urb(read bulk) failed, status = %d", |
1804 | status); | 1799 | status); |
1805 | } | 1800 | } |
1806 | return; | ||
1807 | } | 1801 | } |
1808 | 1802 | ||
1809 | /* | 1803 | /* |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 93dad5853cd5..5627993f9e41 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -1367,8 +1367,6 @@ static void mos7840_break(struct tty_struct *tty, int break_state) | |||
1367 | mos7840_port->shadowLCR); | 1367 | mos7840_port->shadowLCR); |
1368 | mos7840_set_uart_reg(port, LINE_CONTROL_REGISTER, | 1368 | mos7840_set_uart_reg(port, LINE_CONTROL_REGISTER, |
1369 | mos7840_port->shadowLCR); | 1369 | mos7840_port->shadowLCR); |
1370 | |||
1371 | return; | ||
1372 | } | 1370 | } |
1373 | 1371 | ||
1374 | /***************************************************************************** | 1372 | /***************************************************************************** |
@@ -1599,8 +1597,6 @@ static void mos7840_throttle(struct tty_struct *tty) | |||
1599 | if (status < 0) | 1597 | if (status < 0) |
1600 | return; | 1598 | return; |
1601 | } | 1599 | } |
1602 | |||
1603 | return; | ||
1604 | } | 1600 | } |
1605 | 1601 | ||
1606 | /***************************************************************************** | 1602 | /***************************************************************************** |
@@ -2075,8 +2071,6 @@ static void mos7840_change_port_settings(struct tty_struct *tty, | |||
2075 | mos7840_port->delta_msr_cond = 1; | 2071 | mos7840_port->delta_msr_cond = 1; |
2076 | dbg("mos7840_change_port_settings mos7840_port->shadowLCR is End %x", | 2072 | dbg("mos7840_change_port_settings mos7840_port->shadowLCR is End %x", |
2077 | mos7840_port->shadowLCR); | 2073 | mos7840_port->shadowLCR); |
2078 | |||
2079 | return; | ||
2080 | } | 2074 | } |
2081 | 2075 | ||
2082 | /***************************************************************************** | 2076 | /***************************************************************************** |
@@ -2145,7 +2139,6 @@ static void mos7840_set_termios(struct tty_struct *tty, | |||
2145 | mos7840_port->read_urb_busy = false; | 2139 | mos7840_port->read_urb_busy = false; |
2146 | } | 2140 | } |
2147 | } | 2141 | } |
2148 | return; | ||
2149 | } | 2142 | } |
2150 | 2143 | ||
2151 | /***************************************************************************** | 2144 | /***************************************************************************** |
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 89c724c0ac0a..60f38d5e64fc 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
@@ -246,8 +246,6 @@ static void omninet_read_bulk_callback(struct urb *urb) | |||
246 | dev_err(&port->dev, | 246 | dev_err(&port->dev, |
247 | "%s - failed resubmitting read urb, error %d\n", | 247 | "%s - failed resubmitting read urb, error %d\n", |
248 | __func__, result); | 248 | __func__, result); |
249 | |||
250 | return; | ||
251 | } | 249 | } |
252 | 250 | ||
253 | static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, | 251 | static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index d47b56e9e8ce..7481ff8a49e4 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -620,8 +620,6 @@ static void sierra_indat_callback(struct urb *urb) | |||
620 | dev_err(&port->dev, "resubmit read urb failed." | 620 | dev_err(&port->dev, "resubmit read urb failed." |
621 | "(%d)\n", err); | 621 | "(%d)\n", err); |
622 | } | 622 | } |
623 | |||
624 | return; | ||
625 | } | 623 | } |
626 | 624 | ||
627 | static void sierra_instat_callback(struct urb *urb) | 625 | static void sierra_instat_callback(struct urb *urb) |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index 329d311a35d9..765aa983bf58 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
@@ -441,7 +441,6 @@ static void spcp8x5_set_termios(struct tty_struct *tty, | |||
441 | spcp8x5_set_workMode(serial->dev, 0x000a, | 441 | spcp8x5_set_workMode(serial->dev, 0x000a, |
442 | SET_WORKING_MODE_U2C, priv->type); | 442 | SET_WORKING_MODE_U2C, priv->type); |
443 | } | 443 | } |
444 | return; | ||
445 | } | 444 | } |
446 | 445 | ||
447 | /* open the serial port. do some usb system call. set termios and get the line | 446 | /* open the serial port. do some usb system call. set termios and get the line |
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index 0c70b4a621bb..fbc946797801 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c | |||
@@ -234,7 +234,6 @@ static void usb_wwan_indat_callback(struct urb *urb) | |||
234 | } | 234 | } |
235 | 235 | ||
236 | } | 236 | } |
237 | return; | ||
238 | } | 237 | } |
239 | 238 | ||
240 | static void usb_wwan_outdat_callback(struct urb *urb) | 239 | static void usb_wwan_outdat_callback(struct urb *urb) |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 12ed8209ca72..3f9ac88d588c 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -655,8 +655,6 @@ static void whiteheat_release(struct usb_serial *serial) | |||
655 | } | 655 | } |
656 | kfree(info); | 656 | kfree(info); |
657 | } | 657 | } |
658 | |||
659 | return; | ||
660 | } | 658 | } |
661 | 659 | ||
662 | static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port) | 660 | static int whiteheat_open(struct tty_struct *tty, struct usb_serial_port *port) |
@@ -955,8 +953,6 @@ static void whiteheat_throttle(struct tty_struct *tty) | |||
955 | spin_lock_irq(&info->lock); | 953 | spin_lock_irq(&info->lock); |
956 | info->flags |= THROTTLED; | 954 | info->flags |= THROTTLED; |
957 | spin_unlock_irq(&info->lock); | 955 | spin_unlock_irq(&info->lock); |
958 | |||
959 | return; | ||
960 | } | 956 | } |
961 | 957 | ||
962 | 958 | ||
@@ -975,8 +971,6 @@ static void whiteheat_unthrottle(struct tty_struct *tty) | |||
975 | 971 | ||
976 | if (actually_throttled) | 972 | if (actually_throttled) |
977 | rx_data_softint(&info->rx_work); | 973 | rx_data_softint(&info->rx_work); |
978 | |||
979 | return; | ||
980 | } | 974 | } |
981 | 975 | ||
982 | 976 | ||
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index f2767cf2e229..49a489e03716 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig | |||
@@ -36,7 +36,7 @@ config USB_STORAGE_DATAFAB | |||
36 | depends on USB_STORAGE | 36 | depends on USB_STORAGE |
37 | help | 37 | help |
38 | Support for certain Datafab CompactFlash readers. | 38 | Support for certain Datafab CompactFlash readers. |
39 | Datafab has a web page at <http://www.datafabusa.com/>. | 39 | Datafab has a web page at <http://www.datafab.com/>. |
40 | 40 | ||
41 | If this driver is compiled as a module, it will be named ums-datafab. | 41 | If this driver is compiled as a module, it will be named ums-datafab. |
42 | 42 | ||
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8b31fdfefc98..dc06ff134559 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -49,7 +49,7 @@ menuconfig FB | |||
49 | You need an utility program called fbset to make full use of frame | 49 | You need an utility program called fbset to make full use of frame |
50 | buffer devices. Please read <file:Documentation/fb/framebuffer.txt> | 50 | buffer devices. Please read <file:Documentation/fb/framebuffer.txt> |
51 | and the Framebuffer-HOWTO at | 51 | and the Framebuffer-HOWTO at |
52 | <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more | 52 | <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.3.html> for more |
53 | information. | 53 | information. |
54 | 54 | ||
55 | Say Y here and to the driver for your graphics board below if you | 55 | Say Y here and to the driver for your graphics board below if you |
@@ -955,7 +955,7 @@ config FB_EPSON1355 | |||
955 | Build in support for the SED1355 Epson Research Embedded RAMDAC | 955 | Build in support for the SED1355 Epson Research Embedded RAMDAC |
956 | LCD/CRT Controller (since redesignated as the S1D13505) as a | 956 | LCD/CRT Controller (since redesignated as the S1D13505) as a |
957 | framebuffer. Product specs at | 957 | framebuffer. Product specs at |
958 | <http://www.erd.epson.com/vdc/html/products.htm>. | 958 | <http://vdc.epson.com/>. |
959 | 959 | ||
960 | config FB_S1D13XXX | 960 | config FB_S1D13XXX |
961 | tristate "Epson S1D13XXX framebuffer support" | 961 | tristate "Epson S1D13XXX framebuffer support" |
@@ -966,7 +966,7 @@ config FB_S1D13XXX | |||
966 | help | 966 | help |
967 | Support for S1D13XXX framebuffer device family (currently only | 967 | Support for S1D13XXX framebuffer device family (currently only |
968 | working with S1D13806). Product specs at | 968 | working with S1D13806). Product specs at |
969 | <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm> | 969 | <http://vdc.epson.com/> |
970 | 970 | ||
971 | config FB_ATMEL | 971 | config FB_ATMEL |
972 | tristate "AT91/AT32 LCD Controller support" | 972 | tristate "AT91/AT32 LCD Controller support" |
@@ -1323,7 +1323,7 @@ config FB_RADEON | |||
1323 | don't need to choose this to run the Radeon in plain VGA mode. | 1323 | don't need to choose this to run the Radeon in plain VGA mode. |
1324 | 1324 | ||
1325 | There is a product page at | 1325 | There is a product page at |
1326 | http://apps.ati.com/ATIcompare/ | 1326 | http://products.amd.com/en-us/GraphicCardResult.aspx |
1327 | 1327 | ||
1328 | config FB_RADEON_I2C | 1328 | config FB_RADEON_I2C |
1329 | bool "DDC/I2C for ATI Radeon support" | 1329 | bool "DDC/I2C for ATI Radeon support" |
@@ -1395,7 +1395,7 @@ config FB_ATY_CT | |||
1395 | Say Y here to support use of ATI's 64-bit Rage boards (or other | 1395 | Say Y here to support use of ATI's 64-bit Rage boards (or other |
1396 | boards based on the Mach64 CT, VT, GT, and LT chipsets) as a | 1396 | boards based on the Mach64 CT, VT, GT, and LT chipsets) as a |
1397 | framebuffer device. The ATI product support page for these boards | 1397 | framebuffer device. The ATI product support page for these boards |
1398 | is at <http://support.ati.com/products/pc/mach64/>. | 1398 | is at <http://support.ati.com/products/pc/mach64/mach64.html>. |
1399 | 1399 | ||
1400 | config FB_ATY_GENERIC_LCD | 1400 | config FB_ATY_GENERIC_LCD |
1401 | bool "Mach64 generic LCD support (EXPERIMENTAL)" | 1401 | bool "Mach64 generic LCD support (EXPERIMENTAL)" |
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index f3d7440f0072..3ec4923c2d84 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -2,7 +2,6 @@ | |||
2 | * linux/drivers/video/arcfb.c -- FB driver for Arc monochrome LCD board | 2 | * linux/drivers/video/arcfb.c -- FB driver for Arc monochrome LCD board |
3 | * | 3 | * |
4 | * Copyright (C) 2005, Jaya Kumar <jayalk@intworks.biz> | 4 | * Copyright (C) 2005, Jaya Kumar <jayalk@intworks.biz> |
5 | * http://www.intworks.biz/arclcd | ||
6 | * | 5 | * |
7 | * This file is subject to the terms and conditions of the GNU General Public | 6 | * This file is subject to the terms and conditions of the GNU General Public |
8 | * License. See the file COPYING in the main directory of this archive for | 7 | * License. See the file COPYING in the main directory of this archive for |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index b020ba7f1cf2..e7d0f525041e 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -241,12 +241,12 @@ static int request_ports(struct bfin_bf54xfb_info *fbi) | |||
241 | u16 disp = fbi->mach_info->disp; | 241 | u16 disp = fbi->mach_info->disp; |
242 | 242 | ||
243 | if (gpio_request(disp, DRIVER_NAME)) { | 243 | if (gpio_request(disp, DRIVER_NAME)) { |
244 | printk(KERN_ERR "Requesting GPIO %d faild\n", disp); | 244 | printk(KERN_ERR "Requesting GPIO %d failed\n", disp); |
245 | return -EFAULT; | 245 | return -EFAULT; |
246 | } | 246 | } |
247 | 247 | ||
248 | if (peripheral_request_list(eppi_req_18, DRIVER_NAME)) { | 248 | if (peripheral_request_list(eppi_req_18, DRIVER_NAME)) { |
249 | printk(KERN_ERR "Requesting Peripherals faild\n"); | 249 | printk(KERN_ERR "Requesting Peripherals failed\n"); |
250 | gpio_free(disp); | 250 | gpio_free(disp); |
251 | return -EFAULT; | 251 | return -EFAULT; |
252 | } | 252 | } |
@@ -256,7 +256,7 @@ static int request_ports(struct bfin_bf54xfb_info *fbi) | |||
256 | u16 eppi_req_24[] = EPPI0_24; | 256 | u16 eppi_req_24[] = EPPI0_24; |
257 | 257 | ||
258 | if (peripheral_request_list(eppi_req_24, DRIVER_NAME)) { | 258 | if (peripheral_request_list(eppi_req_24, DRIVER_NAME)) { |
259 | printk(KERN_ERR "Requesting Peripherals faild\n"); | 259 | printk(KERN_ERR "Requesting Peripherals failed\n"); |
260 | peripheral_free_list(eppi_req_18); | 260 | peripheral_free_list(eppi_req_18); |
261 | gpio_free(disp); | 261 | gpio_free(disp); |
262 | return -EFAULT; | 262 | return -EFAULT; |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index 7a50272eaab9..3cf77676947c 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -192,7 +192,7 @@ static int bfin_t350mcqb_request_ports(int action) | |||
192 | { | 192 | { |
193 | if (action) { | 193 | if (action) { |
194 | if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { | 194 | if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { |
195 | printk(KERN_ERR "Requesting Peripherals faild\n"); | 195 | printk(KERN_ERR "Requesting Peripherals failed\n"); |
196 | return -EFAULT; | 196 | return -EFAULT; |
197 | } | 197 | } |
198 | } else | 198 | } else |
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index db9713b49ce9..a268cbf1cbea 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller | 4 | * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller |
5 | * (previously known as SED1355) | 5 | * (previously known as SED1355) |
6 | * | 6 | * |
7 | * Cf. http://www.erd.epson.com/vdc/html/S1D13505.html | 7 | * Cf. http://vdc.epson.com/ |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * Copyright (C) Hewlett-Packard Company. All rights reserved. | 10 | * Copyright (C) Hewlett-Packard Company. All rights reserved. |
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c index 7293eaccd81b..7cb715dfc0e1 100644 --- a/drivers/video/fbcvt.c +++ b/drivers/video/fbcvt.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Based from the VESA(TM) Coordinated Video Timing Generator by | 6 | * Based from the VESA(TM) Coordinated Video Timing Generator by |
7 | * Graham Loveridge April 9, 2003 available at | 7 | * Graham Loveridge April 9, 2003 available at |
8 | * http://www.vesa.org/public/CVT/CVTd6r1.xls | 8 | * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls |
9 | * | 9 | * |
10 | * This file is subject to the terms and conditions of the GNU General Public | 10 | * This file is subject to the terms and conditions of the GNU General Public |
11 | * License. See the file COPYING in the main directory of this archive | 11 | * License. See the file COPYING in the main directory of this archive |
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c index 9b3d6e4584cc..63ed3b72b01c 100644 --- a/drivers/video/metronomefb.c +++ b/drivers/video/metronomefb.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. | 10 | * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. |
11 | * | 11 | * |
12 | * This work was made possible by help and equipment support from E-Ink | 12 | * This work was made possible by help and equipment support from E-Ink |
13 | * Corporation. http://support.eink.com/community | 13 | * Corporation. http://www.eink.com/ |
14 | * | 14 | * |
15 | * This driver is written to be used with the Metronome display controller. | 15 | * This driver is written to be used with the Metronome display controller. |
16 | * It is intended to be architecture independent. A board specific driver | 16 | * It is intended to be architecture independent. A board specific driver |
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 090aa1a9be6e..6a069d047914 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c | |||
@@ -253,7 +253,7 @@ static int __init vesafb_probe(struct platform_device *dev) | |||
253 | size_vmode = vesafb_defined.yres * vesafb_fix.line_length; | 253 | size_vmode = vesafb_defined.yres * vesafb_fix.line_length; |
254 | 254 | ||
255 | /* size_total -- all video memory we have. Used for mtrr | 255 | /* size_total -- all video memory we have. Used for mtrr |
256 | * entries, ressource allocation and bounds | 256 | * entries, resource allocation and bounds |
257 | * checking. */ | 257 | * checking. */ |
258 | size_total = screen_info.lfb_size * 65536; | 258 | size_total = screen_info.lfb_size * 65536; |
259 | if (vram_total) | 259 | if (vram_total) |