diff options
Diffstat (limited to 'drivers')
79 files changed, 110 insertions, 119 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 45dbdc14915f..c7219663f2b9 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -435,7 +435,7 @@ config PATA_OPTIDMA | |||
435 | help | 435 | help |
436 | This option enables DMA/PIO support for the later OPTi | 436 | This option enables DMA/PIO support for the later OPTi |
437 | controllers found on some old motherboards and in some | 437 | controllers found on some old motherboards and in some |
438 | latops | 438 | laptops. |
439 | 439 | ||
440 | If unsure, say N. | 440 | If unsure, say N. |
441 | 441 | ||
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index e177c9533b6c..e1c0730a3b99 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c | |||
@@ -101,19 +101,6 @@ static void add_dr(struct device *dev, struct devres_node *node) | |||
101 | list_add_tail(&node->entry, &dev->devres_head); | 101 | list_add_tail(&node->entry, &dev->devres_head); |
102 | } | 102 | } |
103 | 103 | ||
104 | /** | ||
105 | * devres_alloc - Allocate device resource data | ||
106 | * @release: Release function devres will be associated with | ||
107 | * @size: Allocation size | ||
108 | * @gfp: Allocation flags | ||
109 | * | ||
110 | * allocate devres of @size bytes. The allocated area is zeroed, then | ||
111 | * associated with @release. The returned pointer can be passed to | ||
112 | * other devres_*() functions. | ||
113 | * | ||
114 | * RETURNS: | ||
115 | * Pointer to allocated devres on success, NULL on failure. | ||
116 | */ | ||
117 | #ifdef CONFIG_DEBUG_DEVRES | 104 | #ifdef CONFIG_DEBUG_DEVRES |
118 | void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, | 105 | void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, |
119 | const char *name) | 106 | const char *name) |
@@ -128,6 +115,19 @@ void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp, | |||
128 | } | 115 | } |
129 | EXPORT_SYMBOL_GPL(__devres_alloc); | 116 | EXPORT_SYMBOL_GPL(__devres_alloc); |
130 | #else | 117 | #else |
118 | /** | ||
119 | * devres_alloc - Allocate device resource data | ||
120 | * @release: Release function devres will be associated with | ||
121 | * @size: Allocation size | ||
122 | * @gfp: Allocation flags | ||
123 | * | ||
124 | * Allocate devres of @size bytes. The allocated area is zeroed, then | ||
125 | * associated with @release. The returned pointer can be passed to | ||
126 | * other devres_*() functions. | ||
127 | * | ||
128 | * RETURNS: | ||
129 | * Pointer to allocated devres on success, NULL on failure. | ||
130 | */ | ||
131 | void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp) | 131 | void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp) |
132 | { | 132 | { |
133 | struct devres *dr; | 133 | struct devres *dr; |
@@ -416,7 +416,7 @@ static int release_nodes(struct device *dev, struct list_head *first, | |||
416 | } | 416 | } |
417 | 417 | ||
418 | /** | 418 | /** |
419 | * devres_release_all - Release all resources | 419 | * devres_release_all - Release all managed resources |
420 | * @dev: Device to release resources for | 420 | * @dev: Device to release resources for |
421 | * | 421 | * |
422 | * Release all resources associated with @dev. This function is | 422 | * Release all resources associated with @dev. This function is |
@@ -600,7 +600,7 @@ static int devm_kzalloc_match(struct device *dev, void *res, void *data) | |||
600 | } | 600 | } |
601 | 601 | ||
602 | /** | 602 | /** |
603 | * devm_kzalloc - Managed kzalloc | 603 | * devm_kzalloc - Resource-managed kzalloc |
604 | * @dev: Device to allocate memory for | 604 | * @dev: Device to allocate memory for |
605 | * @size: Allocation size | 605 | * @size: Allocation size |
606 | * @gfp: Allocation gfp flags | 606 | * @gfp: Allocation gfp flags |
@@ -628,7 +628,7 @@ void * devm_kzalloc(struct device *dev, size_t size, gfp_t gfp) | |||
628 | EXPORT_SYMBOL_GPL(devm_kzalloc); | 628 | EXPORT_SYMBOL_GPL(devm_kzalloc); |
629 | 629 | ||
630 | /** | 630 | /** |
631 | * devm_kfree - Managed kfree | 631 | * devm_kfree - Resource-managed kfree |
632 | * @dev: Device this memory belongs to | 632 | * @dev: Device this memory belongs to |
633 | * @p: Memory to free | 633 | * @p: Memory to free |
634 | * | 634 | * |
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index eb84d9d44645..869ff8c00146 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -360,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister); | |||
360 | * This function creates a simple platform device that requires minimal | 360 | * This function creates a simple platform device that requires minimal |
361 | * resource and memory management. Canned release function freeing | 361 | * resource and memory management. Canned release function freeing |
362 | * memory allocated for the device allows drivers using such devices | 362 | * memory allocated for the device allows drivers using such devices |
363 | * to be unloaded iwithout waiting for the last reference to the device | 363 | * to be unloaded without waiting for the last reference to the device |
364 | * to be dropped. | 364 | * to be dropped. |
365 | * | 365 | * |
366 | * This interface is primarily intended for use with legacy drivers | 366 | * This interface is primarily intended for use with legacy drivers |
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 43d4ebcb3b44..a1512da32410 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
@@ -151,7 +151,7 @@ static int ramdisk_commit_write(struct file *file, struct page *page, | |||
151 | } | 151 | } |
152 | 152 | ||
153 | /* | 153 | /* |
154 | * ->writepage to the the blockdev's mapping has to redirty the page so that the | 154 | * ->writepage to the blockdev's mapping has to redirty the page so that the |
155 | * VM doesn't go and steal it. We return AOP_WRITEPAGE_ACTIVATE so that the VM | 155 | * VM doesn't go and steal it. We return AOP_WRITEPAGE_ACTIVATE so that the VM |
156 | * won't try to (pointlessly) write the page again for a while. | 156 | * won't try to (pointlessly) write the page again for a while. |
157 | * | 157 | * |
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c index 892db7096986..32ed19c9ec1c 100644 --- a/drivers/char/drm/drm_dma.c +++ b/drivers/char/drm/drm_dma.c | |||
@@ -65,7 +65,7 @@ int drm_dma_setup(drm_device_t * dev) | |||
65 | * \param dev DRM device. | 65 | * \param dev DRM device. |
66 | * | 66 | * |
67 | * Free all pages associated with DMA buffers, the buffers and pages lists, and | 67 | * Free all pages associated with DMA buffers, the buffers and pages lists, and |
68 | * finally the the drm_device::dma structure itself. | 68 | * finally the drm_device::dma structure itself. |
69 | */ | 69 | */ |
70 | void drm_dma_takedown(drm_device_t * dev) | 70 | void drm_dma_takedown(drm_device_t * dev) |
71 | { | 71 | { |
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 35540cfb43dd..b5c5b9fa84c3 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c | |||
@@ -157,7 +157,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, | |||
157 | * \param address access address. | 157 | * \param address access address. |
158 | * \return pointer to the page structure. | 158 | * \return pointer to the page structure. |
159 | * | 159 | * |
160 | * Get the the mapping, find the real physical page to map, get the page, and | 160 | * Get the mapping, find the real physical page to map, get the page, and |
161 | * return it. | 161 | * return it. |
162 | */ | 162 | */ |
163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, | 163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, |
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index a881f96c983e..ecda760ae8c0 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -293,7 +293,7 @@ I am fairly certain that they are correct unless stated otherwise in comments. | |||
293 | # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 | 293 | # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 |
294 | # define R300_PVS_CNTL_1_POS_END_SHIFT 10 | 294 | # define R300_PVS_CNTL_1_POS_END_SHIFT 10 |
295 | # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 | 295 | # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 |
296 | /* Addresses are relative the the vertex program parameters area. */ | 296 | /* Addresses are relative to the vertex program parameters area. */ |
297 | #define R300_VAP_PVS_CNTL_2 0x22D4 | 297 | #define R300_VAP_PVS_CNTL_2 0x22D4 |
298 | # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 | 298 | # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 |
299 | # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 | 299 | # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 |
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index 49f914e79216..9e1fc02967ff 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * | 12 | * |
13 | * This driver allows use of the real time clock (built into | 13 | * This driver allows use of the real time clock (built into |
14 | * nearly all computers) from user space. It exports the /dev/rtc | 14 | * nearly all computers) from user space. It exports the /dev/rtc |
15 | * interface supporting various ioctl() and also the /proc/dev/rtc | 15 | * interface supporting various ioctl() and also the /proc/driver/rtc |
16 | * pseudo-file for status information. | 16 | * pseudo-file for status information. |
17 | * | 17 | * |
18 | * The ioctls can be used to set the interrupt behaviour where | 18 | * The ioctls can be used to set the interrupt behaviour where |
@@ -377,7 +377,7 @@ static int gen_rtc_release(struct inode *inode, struct file *file) | |||
377 | #ifdef CONFIG_PROC_FS | 377 | #ifdef CONFIG_PROC_FS |
378 | 378 | ||
379 | /* | 379 | /* |
380 | * Info exported via "/proc/rtc". | 380 | * Info exported via "/proc/driver/rtc". |
381 | */ | 381 | */ |
382 | 382 | ||
383 | static int gen_rtc_proc_output(char *buf) | 383 | static int gen_rtc_proc_output(char *buf) |
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 561d0e151d0f..fee58e03dbe2 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1091,7 +1091,7 @@ static ssize_t cmm_write(struct file *filp, const char __user *buf, | |||
1091 | /* | 1091 | /* |
1092 | * wait for atr to become valid. | 1092 | * wait for atr to become valid. |
1093 | * note: it is important to lock this code. if we dont, the monitor | 1093 | * note: it is important to lock this code. if we dont, the monitor |
1094 | * could be run between test_bit and the the call the sleep on the | 1094 | * could be run between test_bit and the call to sleep on the |
1095 | * atr-queue. if *then* the monitor detects atr valid, it will wake up | 1095 | * atr-queue. if *then* the monitor detects atr valid, it will wake up |
1096 | * any process on the atr-queue, *but* since we have been interrupted, | 1096 | * any process on the atr-queue, *but* since we have been interrupted, |
1097 | * we do not yet sleep on this queue. this would result in a missed | 1097 | * we do not yet sleep on this queue. this would result in a missed |
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index fe00c7dfb649..11089be0691b 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
@@ -33,7 +33,7 @@ config TCG_NSC | |||
33 | tristate "National Semiconductor TPM Interface" | 33 | tristate "National Semiconductor TPM Interface" |
34 | depends on TCG_TPM && PNPACPI | 34 | depends on TCG_TPM && PNPACPI |
35 | ---help--- | 35 | ---help--- |
36 | If you have a TPM security chip from National Semicondutor | 36 | If you have a TPM security chip from National Semiconductor |
37 | say Yes and it will be accessible from within Linux. To | 37 | say Yes and it will be accessible from within Linux. To |
38 | compile this driver as a module, choose M here; the module | 38 | compile this driver as a module, choose M here; the module |
39 | will be called tpm_nsc. | 39 | will be called tpm_nsc. |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index bf5a00145c0b..fc662e4ce58a 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -1573,11 +1573,11 @@ void no_tty(void) | |||
1573 | 1573 | ||
1574 | 1574 | ||
1575 | /** | 1575 | /** |
1576 | * stop_tty - propogate flow control | 1576 | * stop_tty - propagate flow control |
1577 | * @tty: tty to stop | 1577 | * @tty: tty to stop |
1578 | * | 1578 | * |
1579 | * Perform flow control to the driver. For PTY/TTY pairs we | 1579 | * Perform flow control to the driver. For PTY/TTY pairs we |
1580 | * must also propogate the TIOCKPKT status. May be called | 1580 | * must also propagate the TIOCKPKT status. May be called |
1581 | * on an already stopped device and will not re-call the driver | 1581 | * on an already stopped device and will not re-call the driver |
1582 | * method. | 1582 | * method. |
1583 | * | 1583 | * |
@@ -1607,11 +1607,11 @@ void stop_tty(struct tty_struct *tty) | |||
1607 | EXPORT_SYMBOL(stop_tty); | 1607 | EXPORT_SYMBOL(stop_tty); |
1608 | 1608 | ||
1609 | /** | 1609 | /** |
1610 | * start_tty - propogate flow control | 1610 | * start_tty - propagate flow control |
1611 | * @tty: tty to start | 1611 | * @tty: tty to start |
1612 | * | 1612 | * |
1613 | * Start a tty that has been stopped if at all possible. Perform | 1613 | * Start a tty that has been stopped if at all possible. Perform |
1614 | * any neccessary wakeups and propogate the TIOCPKT status. If this | 1614 | * any neccessary wakeups and propagate the TIOCPKT status. If this |
1615 | * is the tty was previous stopped and is being started then the | 1615 | * is the tty was previous stopped and is being started then the |
1616 | * driver start method is invoked and the line discipline woken. | 1616 | * driver start method is invoked and the line discipline woken. |
1617 | * | 1617 | * |
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index f21fe66c9eef..f4c634504d1a 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
@@ -51,7 +51,7 @@ config CRYPTO_DEV_GEODE | |||
51 | default m | 51 | default m |
52 | help | 52 | help |
53 | Say 'Y' here to use the AMD Geode LX processor on-board AES | 53 | Say 'Y' here to use the AMD Geode LX processor on-board AES |
54 | engine for the CryptoAPI AES alogrithm. | 54 | engine for the CryptoAPI AES algorithm. |
55 | 55 | ||
56 | To compile this driver as a module, choose M here: the module | 56 | To compile this driver as a module, choose M here: the module |
57 | will be called geode-aes. | 57 | will be called geode-aes. |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index c0188de3cc66..79cec50a242f 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -831,7 +831,7 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif) | |||
831 | 831 | ||
832 | /* | 832 | /* |
833 | * Now set up the hw. We have to do this ourselves as | 833 | * Now set up the hw. We have to do this ourselves as |
834 | * the MMIO layout isnt the same as the the standard port | 834 | * the MMIO layout isnt the same as the standard port |
835 | * based I/O | 835 | * based I/O |
836 | */ | 836 | */ |
837 | 837 | ||
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 6a1a0572275e..835937e38529 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
@@ -1702,7 +1702,7 @@ static int nodemgr_host_thread(void *__hi) | |||
1702 | generation = get_hpsb_generation(host); | 1702 | generation = get_hpsb_generation(host); |
1703 | 1703 | ||
1704 | /* If we get a reset before we are done waiting, then | 1704 | /* If we get a reset before we are done waiting, then |
1705 | * start the the waiting over again */ | 1705 | * start the waiting over again */ |
1706 | if (generation != g) | 1706 | if (generation != g) |
1707 | g = generation, i = 0; | 1707 | g = generation, i = 0; |
1708 | } | 1708 | } |
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index c921d6c522f5..c92f9d764fce 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig | |||
@@ -17,7 +17,7 @@ config CAPI_TRACE | |||
17 | help | 17 | help |
18 | If you say Y here, the kernelcapi driver can make verbose traces | 18 | If you say Y here, the kernelcapi driver can make verbose traces |
19 | of CAPI messages. This feature can be enabled/disabled via IOCTL for | 19 | of CAPI messages. This feature can be enabled/disabled via IOCTL for |
20 | every controler (default disabled). | 20 | every controller (default disabled). |
21 | This will increase the size of the kernelcapi module by 20 KB. | 21 | This will increase the size of the kernelcapi module by 20 KB. |
22 | If unsure, say Y. | 22 | If unsure, say Y. |
23 | 23 | ||
diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h index af3eb9e795b5..85784a7ffb25 100644 --- a/drivers/isdn/hardware/eicon/divasync.h +++ b/drivers/isdn/hardware/eicon/divasync.h | |||
@@ -216,7 +216,7 @@ typedef struct | |||
216 | #define SERIAL_HOOK_RING 0x85 | 216 | #define SERIAL_HOOK_RING 0x85 |
217 | #define SERIAL_HOOK_DETACH 0x8f | 217 | #define SERIAL_HOOK_DETACH 0x8f |
218 | unsigned char Flags; /* function refinements */ | 218 | unsigned char Flags; /* function refinements */ |
219 | /* parameters passed by the the ATTACH request */ | 219 | /* parameters passed by the ATTACH request */ |
220 | SERIAL_INT_CB InterruptHandler; /* called on each interrupt */ | 220 | SERIAL_INT_CB InterruptHandler; /* called on each interrupt */ |
221 | SERIAL_DPC_CB DeferredHandler; /* called on hook state changes */ | 221 | SERIAL_DPC_CB DeferredHandler; /* called on hook state changes */ |
222 | void *HandlerContext; /* context for both handlers */ | 222 | void *HandlerContext; /* context for both handlers */ |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 99e70d4103b6..1f18f1993387 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
@@ -1217,11 +1217,11 @@ usb_init(hfcusb_data * hfc) | |||
1217 | /* aux = output, reset off */ | 1217 | /* aux = output, reset off */ |
1218 | write_usb(hfc, HFCUSB_CIRM, 0x10); | 1218 | write_usb(hfc, HFCUSB_CIRM, 0x10); |
1219 | 1219 | ||
1220 | /* set USB_SIZE to match the the wMaxPacketSize for INT or BULK transfers */ | 1220 | /* set USB_SIZE to match the wMaxPacketSize for INT or BULK transfers */ |
1221 | write_usb(hfc, HFCUSB_USB_SIZE, | 1221 | write_usb(hfc, HFCUSB_USB_SIZE, |
1222 | (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4)); | 1222 | (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4)); |
1223 | 1223 | ||
1224 | /* set USB_SIZE_I to match the the wMaxPacketSize for ISO transfers */ | 1224 | /* set USB_SIZE_I to match the wMaxPacketSize for ISO transfers */ |
1225 | write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); | 1225 | write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); |
1226 | 1226 | ||
1227 | /* enable PCM/GCI master mode */ | 1227 | /* enable PCM/GCI master mode */ |
diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c index 1d49d2ade557..677c99325be5 100644 --- a/drivers/leds/leds-h1940.c +++ b/drivers/leds/leds-h1940.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/leds/h1940-leds.c | 2 | * drivers/leds/leds-h1940.c |
3 | * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org> | 3 | * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org> |
4 | * | 4 | * |
5 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index a32c91e27b3c..58926da0ae18 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
@@ -237,7 +237,7 @@ config PMAC_RACKMETER | |||
237 | tristate "Support for Apple XServe front panel LEDs" | 237 | tristate "Support for Apple XServe front panel LEDs" |
238 | depends on PPC_PMAC | 238 | depends on PPC_PMAC |
239 | help | 239 | help |
240 | This driver procides some support to control the front panel | 240 | This driver provides some support to control the front panel |
241 | blue LEDs "vu-meter" of the XServer macs. | 241 | blue LEDs "vu-meter" of the XServer macs. |
242 | 242 | ||
243 | endif # MACINTOSH_DRIVERS | 243 | endif # MACINTOSH_DRIVERS |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c index 68ed3a788083..9200a30dd1b9 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de) | 3 | * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de) |
4 | * see dvb-usb-init.c for copyright information. | 4 | * see dvb-usb-init.c for copyright information. |
5 | * | 5 | * |
6 | * This file contains functions for initializing the the input-device and for handling remote-control-queries. | 6 | * This file contains functions for initializing the input-device and for handling remote-control-queries. |
7 | */ | 7 | */ |
8 | #include "dvb-usb-common.h" | 8 | #include "dvb-usb-common.h" |
9 | #include <linux/usb/input.h> | 9 | #include <linux/usb/input.h> |
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index f5d40aa3d27f..f64546c6aeb5 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -266,7 +266,7 @@ static int dib7000m_sad_calib(struct dib7000m_state *state) | |||
266 | { | 266 | { |
267 | 267 | ||
268 | /* internal */ | 268 | /* internal */ |
269 | // dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth | 269 | // dib7000m_write_word(state, 928, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth |
270 | dib7000m_write_word(state, 929, (0 << 1) | (0 << 0)); | 270 | dib7000m_write_word(state, 929, (0 << 1) | (0 << 0)); |
271 | dib7000m_write_word(state, 930, 776); // 0.625*3.3 / 4096 | 271 | dib7000m_write_word(state, 930, 776); // 0.625*3.3 / 4096 |
272 | 272 | ||
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 0349a4b5da3f..aece458cfe12 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -223,7 +223,7 @@ static int dib7000p_set_bandwidth(struct dvb_frontend *demod, u8 BW_Idx) | |||
223 | static int dib7000p_sad_calib(struct dib7000p_state *state) | 223 | static int dib7000p_sad_calib(struct dib7000p_state *state) |
224 | { | 224 | { |
225 | /* internal */ | 225 | /* internal */ |
226 | // dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth | 226 | // dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is written in set_bandwidth |
227 | dib7000p_write_word(state, 73, (0 << 1) | (0 << 0)); | 227 | dib7000p_write_word(state, 73, (0 << 1) | (0 << 0)); |
228 | dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096 | 228 | dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096 |
229 | 229 | ||
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 110536843e8e..e725f612a6b7 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | TDA10021 - Single Chip Cable Channel Receiver driver module | 2 | TDA10021 - Single Chip Cable Channel Receiver driver module |
3 | used on the the Siemens DVB-C cards | 3 | used on the Siemens DVB-C cards |
4 | 4 | ||
5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> | 5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> |
6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> | 6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> |
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 54d7b07571b8..23fd0303c91b 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c | |||
@@ -306,7 +306,7 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
306 | * The ves1893 sometimes returns sync values that make no sense, | 306 | * The ves1893 sometimes returns sync values that make no sense, |
307 | * because, e.g., the SIGNAL bit is 0, while some of the higher | 307 | * because, e.g., the SIGNAL bit is 0, while some of the higher |
308 | * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?). | 308 | * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?). |
309 | * Tests showed that the the VITERBI and SYNC bits are returned | 309 | * Tests showed that the VITERBI and SYNC bits are returned |
310 | * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong. | 310 | * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong. |
311 | * If such a case occurs, we read the value again, until we get a | 311 | * If such a case occurs, we read the value again, until we get a |
312 | * valid value. | 312 | * valid value. |
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 563a8319e608..54ccc6e1f92e 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -70,7 +70,7 @@ static int em2800_i2c_send_max4(struct em28xx *dev, unsigned char addr, | |||
70 | 70 | ||
71 | ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len); | 71 | ret = dev->em28xx_write_regs(dev, 4 - len, &b2[4 - len], 2 + len); |
72 | if (ret != 2 + len) { | 72 | if (ret != 2 + len) { |
73 | em28xx_warn("writting to i2c device failed (error=%i)\n", ret); | 73 | em28xx_warn("writing to i2c device failed (error=%i)\n", ret); |
74 | return -EIO; | 74 | return -EIO; |
75 | } | 75 | } |
76 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; | 76 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index bec67609500f..2c7b158ce7e1 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1729,7 +1729,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
1729 | 1729 | ||
1730 | endpoint = &interface->cur_altsetting->endpoint[1].desc; | 1730 | endpoint = &interface->cur_altsetting->endpoint[1].desc; |
1731 | 1731 | ||
1732 | /* check if the the device has the iso in endpoint at the correct place */ | 1732 | /* check if the device has the iso in endpoint at the correct place */ |
1733 | if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != | 1733 | if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != |
1734 | USB_ENDPOINT_XFER_ISOC) { | 1734 | USB_ENDPOINT_XFER_ISOC) { |
1735 | em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n"); | 1735 | em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n"); |
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index f5e848410311..f9f3584281d8 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt | |||
@@ -54,9 +54,9 @@ fps | |||
54 | Specifies the desired framerate. Is an integer in the range of 4-30. | 54 | Specifies the desired framerate. Is an integer in the range of 4-30. |
55 | 55 | ||
56 | fbufs | 56 | fbufs |
57 | This paramter specifies the number of internal buffers to use for storing | 57 | This parameter specifies the number of internal buffers to use for storing |
58 | frames from the cam. This will help if the process that reads images from | 58 | frames from the cam. This will help if the process that reads images from |
59 | the cam is a bit slow or momentarely busy. However, on slow machines it | 59 | the cam is a bit slow or momentarily busy. However, on slow machines it |
60 | only introduces lag, so choose carefully. The default is 3, which is | 60 | only introduces lag, so choose carefully. The default is 3, which is |
61 | reasonable. You can set it between 2 and 5. | 61 | reasonable. You can set it between 2 and 5. |
62 | 62 | ||
@@ -209,7 +209,7 @@ trace | |||
209 | 209 | ||
210 | 128 0x80 PWCX debugging Off | 210 | 128 0x80 PWCX debugging Off |
211 | 211 | ||
212 | For example, to trace the open() & read() fuctions, sum 8 + 4 = 12, | 212 | For example, to trace the open() & read() functions, sum 8 + 4 = 12, |
213 | so you would supply trace=12 during insmod or modprobe. If | 213 | so you would supply trace=12 during insmod or modprobe. If |
214 | you want to turn the initialization and probing tracing off, set trace=0. | 214 | you want to turn the initialization and probing tracing off, set trace=0. |
215 | The default value for trace is 35 (0x23). | 215 | The default value for trace is 35 (0x23). |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 876fd2768242..982b115193f8 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * Portions of this code were also copied from usbvideo.c | 29 | * Portions of this code were also copied from usbvideo.c |
30 | * | 30 | * |
31 | * Special thanks to the the whole team at Sourceforge for help making | 31 | * Special thanks to the whole team at Sourceforge for help making |
32 | * this driver become a reality. Notably: | 32 | * this driver become a reality. Notably: |
33 | * Andy Armstrong who reverse engineered the color encoding and | 33 | * Andy Armstrong who reverse engineered the color encoding and |
34 | * Pavel Machek and Chris Cheney who worked on reverse engineering the | 34 | * Pavel Machek and Chris Cheney who worked on reverse engineering the |
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt index d6b4c607453b..ddc7ae029dd3 100644 --- a/drivers/message/fusion/lsi/mpi_history.txt +++ b/drivers/message/fusion/lsi/mpi_history.txt | |||
@@ -571,7 +571,7 @@ mpi_fc.h | |||
571 | * 11-02-00 01.01.01 Original release for post 1.0 work | 571 | * 11-02-00 01.01.01 Original release for post 1.0 work |
572 | * 12-04-00 01.01.02 Added messages for Common Transport Send and | 572 | * 12-04-00 01.01.02 Added messages for Common Transport Send and |
573 | * Primitive Send. | 573 | * Primitive Send. |
574 | * 01-09-01 01.01.03 Modifed some of the new flags to have an MPI prefix | 574 | * 01-09-01 01.01.03 Modified some of the new flags to have an MPI prefix |
575 | * and modified the FcPrimitiveSend flags. | 575 | * and modified the FcPrimitiveSend flags. |
576 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger | 576 | * 01-25-01 01.01.04 Move InitiatorIndex in LinkServiceRsp reply to a larger |
577 | * field. | 577 | * field. |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 97471af4309c..5021d1a2a1d4 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -3585,7 +3585,7 @@ initChainBuffers(MPT_ADAPTER *ioc) | |||
3585 | * index = chain_idx | 3585 | * index = chain_idx |
3586 | * | 3586 | * |
3587 | * Calculate the number of chain buffers needed(plus 1) per I/O | 3587 | * Calculate the number of chain buffers needed(plus 1) per I/O |
3588 | * then multiply the the maximum number of simultaneous cmds | 3588 | * then multiply the maximum number of simultaneous cmds |
3589 | * | 3589 | * |
3590 | * num_sge = num sge in request frame + last chain buffer | 3590 | * num_sge = num sge in request frame + last chain buffer |
3591 | * scale = num sge per chain buffer if no chain element | 3591 | * scale = num sge per chain buffer if no chain element |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index d990d8141ef5..5fcd8b3631ba 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -60,7 +60,7 @@ config MTD_PHYSMAP_BANKWIDTH | |||
60 | (i.e., run-time calling physmap_configure()). | 60 | (i.e., run-time calling physmap_configure()). |
61 | 61 | ||
62 | config MTD_PHYSMAP_OF | 62 | config MTD_PHYSMAP_OF |
63 | tristate "Flash device in physical memory map based on OF descirption" | 63 | tristate "Flash device in physical memory map based on OF description" |
64 | depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) | 64 | depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) |
65 | help | 65 | help |
66 | This provides a 'mapping' driver which allows the NOR Flash and | 66 | This provides a 'mapping' driver which allows the NOR Flash and |
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c index 9f53c655af3a..7b96cd02f82b 100644 --- a/drivers/mtd/maps/nettel.c +++ b/drivers/mtd/maps/nettel.c | |||
@@ -358,7 +358,7 @@ int __init nettel_init(void) | |||
358 | /* Turn other PAR off so the first probe doesn't find it */ | 358 | /* Turn other PAR off so the first probe doesn't find it */ |
359 | *intel1par = 0; | 359 | *intel1par = 0; |
360 | 360 | ||
361 | /* Probe for the the size of the first Intel flash */ | 361 | /* Probe for the size of the first Intel flash */ |
362 | nettel_intel_map.size = maxsize; | 362 | nettel_intel_map.size = maxsize; |
363 | nettel_intel_map.phys = intel0addr; | 363 | nettel_intel_map.phys = intel0addr; |
364 | nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize); | 364 | nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize); |
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 000794c6caf5..0537fac8de74 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c | |||
@@ -2192,7 +2192,7 @@ static int onenand_check_maf(int manuf) | |||
2192 | * @param mtd MTD device structure | 2192 | * @param mtd MTD device structure |
2193 | * | 2193 | * |
2194 | * OneNAND detection method: | 2194 | * OneNAND detection method: |
2195 | * Compare the the values from command with ones from register | 2195 | * Compare the values from command with ones from register |
2196 | */ | 2196 | */ |
2197 | static int onenand_probe(struct mtd_info *mtd) | 2197 | static int onenand_probe(struct mtd_info *mtd) |
2198 | { | 2198 | { |
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 9588da3a30e7..127f60841b10 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -95,8 +95,7 @@ static int max_interrupt_work = 10; | |||
95 | #include <asm/io.h> | 95 | #include <asm/io.h> |
96 | #include <asm/irq.h> | 96 | #include <asm/irq.h> |
97 | 97 | ||
98 | static char versionA[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n"; | 98 | static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n"; |
99 | static char versionB[] __initdata = "http://www.scyld.com/network/3c509.html\n"; | ||
100 | 99 | ||
101 | #if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA)) | 100 | #if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA)) |
102 | #define EL3_SUSPEND | 101 | #define EL3_SUSPEND |
@@ -360,7 +359,7 @@ static int __init el3_common_init(struct net_device *dev) | |||
360 | printk(", IRQ %d.\n", dev->irq); | 359 | printk(", IRQ %d.\n", dev->irq); |
361 | 360 | ||
362 | if (el3_debug > 0) | 361 | if (el3_debug > 0) |
363 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 362 | printk(KERN_INFO "%s", version); |
364 | return 0; | 363 | return 0; |
365 | 364 | ||
366 | } | 365 | } |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 80924f76dee8..f26ca331615e 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -103,7 +103,7 @@ static int vortex_debug = 1; | |||
103 | 103 | ||
104 | 104 | ||
105 | static char version[] __devinitdata = | 105 | static char version[] __devinitdata = |
106 | DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n"; | 106 | DRV_NAME ": Donald Becker and others.\n"; |
107 | 107 | ||
108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 108 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
109 | MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "); | 109 | MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "); |
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 18aba838c1ff..82d78ff8399b 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -31,10 +31,8 @@ | |||
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | static const char versionA[] = | 34 | static const char version[] = |
35 | "atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n"; | 35 | "atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n"; |
36 | static const char versionB[] = | ||
37 | " http://www.scyld.com/network/atp.html\n"; | ||
38 | 36 | ||
39 | /* The user-configurable values. | 37 | /* The user-configurable values. |
40 | These may be modified when a driver module is loaded.*/ | 38 | These may be modified when a driver module is loaded.*/ |
@@ -324,7 +322,7 @@ static int __init atp_probe1(long ioaddr) | |||
324 | 322 | ||
325 | #ifndef MODULE | 323 | #ifndef MODULE |
326 | if (net_debug) | 324 | if (net_debug) |
327 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 325 | printk(KERN_INFO "%s", version); |
328 | #endif | 326 | #endif |
329 | 327 | ||
330 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM " | 328 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM " |
@@ -926,7 +924,7 @@ static void set_rx_mode_8012(struct net_device *dev) | |||
926 | 924 | ||
927 | static int __init atp_init_module(void) { | 925 | static int __init atp_init_module(void) { |
928 | if (debug) /* Emit version even if no cards detected. */ | 926 | if (debug) /* Emit version even if no cards detected. */ |
929 | printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB); | 927 | printk(KERN_INFO "%s", version); |
930 | return atp_init(); | 928 | return atp_init(); |
931 | } | 929 | } |
932 | 930 | ||
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 724bce51f936..223517dcbcfd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -3461,7 +3461,7 @@ void bond_unregister_arp(struct bonding *bond) | |||
3461 | /*---------------------------- Hashing Policies -----------------------------*/ | 3461 | /*---------------------------- Hashing Policies -----------------------------*/ |
3462 | 3462 | ||
3463 | /* | 3463 | /* |
3464 | * Hash for the the output device based upon layer 3 and layer 4 data. If | 3464 | * Hash for the output device based upon layer 3 and layer 4 data. If |
3465 | * the packet is a frag or not TCP or UDP, just use layer 3 data. If it is | 3465 | * the packet is a frag or not TCP or UDP, just use layer 3 data. If it is |
3466 | * altogether not IP, mimic bond_xmit_hash_policy_l2() | 3466 | * altogether not IP, mimic bond_xmit_hash_policy_l2() |
3467 | */ | 3467 | */ |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 39654e1e2bed..47680237f783 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1126,7 +1126,7 @@ static void eepro_tx_timeout (struct net_device *dev) | |||
1126 | printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name, | 1126 | printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name, |
1127 | "network cable problem"); | 1127 | "network cable problem"); |
1128 | /* This is not a duplicate. One message for the console, | 1128 | /* This is not a duplicate. One message for the console, |
1129 | one for the the log file */ | 1129 | one for the log file */ |
1130 | printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name, | 1130 | printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name, |
1131 | "network cable problem"); | 1131 | "network cable problem"); |
1132 | eepro_complete_selreset(ioaddr); | 1132 | eepro_complete_selreset(ioaddr); |
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 6c267c38df97..9800341956a2 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | static const char * const version = | 30 | static const char * const version = |
31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n" | 31 | "eepro100.c:v1.09j-t 9/29/99 Donald Becker\n" |
32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; | 32 | "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n"; |
33 | 33 | ||
34 | /* A few user-configurable values that apply to all boards. | 34 | /* A few user-configurable values that apply to all boards. |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 4e3f14c9c717..5e517946f46a 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -93,8 +93,6 @@ static int rx_copybreak; | |||
93 | static char version[] __devinitdata = | 93 | static char version[] __devinitdata = |
94 | DRV_NAME ".c:v1.11 1/7/2001 Written by Donald Becker <becker@scyld.com>\n"; | 94 | DRV_NAME ".c:v1.11 1/7/2001 Written by Donald Becker <becker@scyld.com>\n"; |
95 | static char version2[] __devinitdata = | 95 | static char version2[] __devinitdata = |
96 | " http://www.scyld.com/network/epic100.html\n"; | ||
97 | static char version3[] __devinitdata = | ||
98 | " (unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n"; | 96 | " (unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n"; |
99 | 97 | ||
100 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 98 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
@@ -323,8 +321,8 @@ static int __devinit epic_init_one (struct pci_dev *pdev, | |||
323 | #ifndef MODULE | 321 | #ifndef MODULE |
324 | static int printed_version; | 322 | static int printed_version; |
325 | if (!printed_version++) | 323 | if (!printed_version++) |
326 | printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s", | 324 | printk (KERN_INFO "%s" KERN_INFO "%s", |
327 | version, version2, version3); | 325 | version, version2); |
328 | #endif | 326 | #endif |
329 | 327 | ||
330 | card_idx++; | 328 | card_idx++; |
@@ -1596,8 +1594,8 @@ static int __init epic_init (void) | |||
1596 | { | 1594 | { |
1597 | /* when a module, this is printed whether or not devices are found in probe */ | 1595 | /* when a module, this is printed whether or not devices are found in probe */ |
1598 | #ifdef MODULE | 1596 | #ifdef MODULE |
1599 | printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s", | 1597 | printk (KERN_INFO "%s" KERN_INFO "%s", |
1600 | version, version2, version3); | 1598 | version, version2); |
1601 | #endif | 1599 | #endif |
1602 | 1600 | ||
1603 | return pci_register_driver(&epic_driver); | 1601 | return pci_register_driver(&epic_driver); |
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 6e90619b3b41..36d2c7d4f4d0 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
@@ -140,7 +140,7 @@ config BAYCOM_SER_HDX | |||
140 | modems that connect to a serial interface. The driver supports the | 140 | modems that connect to a serial interface. The driver supports the |
141 | ser12 design in half-duplex mode. This is the old driver. It is | 141 | ser12 design in half-duplex mode. This is the old driver. It is |
142 | still provided in case your serial interface chip does not work with | 142 | still provided in case your serial interface chip does not work with |
143 | the full-duplex driver. This driver is depreciated. To configure | 143 | the full-duplex driver. This driver is deprecated. To configure |
144 | the driver, use the sethdlc utility available in the standard ax25 | 144 | the driver, use the sethdlc utility available in the standard ax25 |
145 | utilities package. For information on the modems, see | 145 | utilities package. For information on the modems, see |
146 | <http://www.baycom.de/> and | 146 | <http://www.baycom.de/> and |
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 2ab173d9a0e4..1e67720f1066 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -113,7 +113,7 @@ | |||
113 | /* RxOver overflow in Recv FIFO */ | 113 | /* RxOver overflow in Recv FIFO */ |
114 | /* SipRcv received serial gap (or other condition you set) */ | 114 | /* SipRcv received serial gap (or other condition you set) */ |
115 | /* Interrupts are enabled by writing a one to the IER register */ | 115 | /* Interrupts are enabled by writing a one to the IER register */ |
116 | /* Interrupts are cleared by writting a one to the ISR register */ | 116 | /* Interrupts are cleared by writing a one to the ISR register */ |
117 | /* */ | 117 | /* */ |
118 | /* 6. The remaining registers: 0x6 and 0x3 appear to be */ | 118 | /* 6. The remaining registers: 0x6 and 0x3 appear to be */ |
119 | /* reserved parts of 16 or 32 bit registersthe remainder */ | 119 | /* reserved parts of 16 or 32 bit registersthe remainder */ |
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c index f15aebde7b90..52c99d01d568 100644 --- a/drivers/net/ixgb/ixgb_ee.c +++ b/drivers/net/ixgb/ixgb_ee.c | |||
@@ -315,7 +315,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw) | |||
315 | * hw - Struct containing variables accessed by shared code | 315 | * hw - Struct containing variables accessed by shared code |
316 | * | 316 | * |
317 | * Reads the first 64 16 bit words of the EEPROM and sums the values read. | 317 | * Reads the first 64 16 bit words of the EEPROM and sums the values read. |
318 | * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is | 318 | * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is |
319 | * valid. | 319 | * valid. |
320 | * | 320 | * |
321 | * Returns: | 321 | * Returns: |
diff --git a/drivers/net/meth.h b/drivers/net/meth.h index 84960dae2a22..ea3b8fc86d1e 100644 --- a/drivers/net/meth.h +++ b/drivers/net/meth.h | |||
@@ -126,7 +126,7 @@ typedef struct rx_packet { | |||
126 | /* Note: when loopback is set this bit becomes collision control. Setting this bit will */ | 126 | /* Note: when loopback is set this bit becomes collision control. Setting this bit will */ |
127 | /* cause a collision to be reported. */ | 127 | /* cause a collision to be reported. */ |
128 | 128 | ||
129 | /* Bits 5 and 6 are used to determine the the Destination address filter mode */ | 129 | /* Bits 5 and 6 are used to determine the Destination address filter mode */ |
130 | #define METH_ACCEPT_MY 0 /* 00: Accept PHY address only */ | 130 | #define METH_ACCEPT_MY 0 /* 00: Accept PHY address only */ |
131 | #define METH_ACCEPT_MCAST 0x20 /* 01: Accept physical, broadcast, and multicast filter matches only */ | 131 | #define METH_ACCEPT_MCAST 0x20 /* 01: Accept physical, broadcast, and multicast filter matches only */ |
132 | #define METH_ACCEPT_AMCAST 0x40 /* 10: Accept physical, broadcast, and all multicast packets */ | 132 | #define METH_ACCEPT_AMCAST 0x40 /* 10: Accept physical, broadcast, and all multicast packets */ |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 223e0e6264ba..4cf0d3fcb519 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -131,7 +131,6 @@ static const char version[] __devinitdata = | |||
131 | KERN_INFO DRV_NAME " dp8381x driver, version " | 131 | KERN_INFO DRV_NAME " dp8381x driver, version " |
132 | DRV_VERSION ", " DRV_RELDATE "\n" | 132 | DRV_VERSION ", " DRV_RELDATE "\n" |
133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" | 133 | KERN_INFO " originally by Donald Becker <becker@scyld.com>\n" |
134 | KERN_INFO " http://www.scyld.com/network/natsemi.html\n" | ||
135 | KERN_INFO " 2.4.x kernel port by Jeff Garzik, Tjeerd Mulder\n"; | 134 | KERN_INFO " 2.4.x kernel port by Jeff Garzik, Tjeerd Mulder\n"; |
136 | 135 | ||
137 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 136 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 589785d1e762..995c0a5d4066 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -63,8 +63,7 @@ static int options[MAX_UNITS]; | |||
63 | 63 | ||
64 | /* These identify the driver base version and may not be removed. */ | 64 | /* These identify the driver base version and may not be removed. */ |
65 | static char version[] __devinitdata = | 65 | static char version[] __devinitdata = |
66 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n" | 66 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n"; |
67 | KERN_INFO " http://www.scyld.com/network/ne2k-pci.html\n"; | ||
68 | 67 | ||
69 | #if defined(__powerpc__) | 68 | #if defined(__powerpc__) |
70 | #define inl_le(addr) le32_to_cpu(inl(addr)) | 69 | #define inl_le(addr) le32_to_cpu(inl(addr)) |
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index f51ba31970aa..e1f912d04043 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -110,8 +110,7 @@ static char *media[MAX_UNITS]; | |||
110 | 110 | ||
111 | /* These identify the driver base version and may not be removed. */ | 111 | /* These identify the driver base version and may not be removed. */ |
112 | static char version[] = | 112 | static char version[] = |
113 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n" | 113 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"; |
114 | KERN_INFO " http://www.scyld.com/network/sundance.html\n"; | ||
115 | 114 | ||
116 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 115 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
117 | MODULE_DESCRIPTION("Sundance Alta Ethernet driver"); | 116 | MODULE_DESCRIPTION("Sundance Alta Ethernet driver"); |
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index 9b08afbd1f65..ea896777bcaf 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
@@ -269,7 +269,7 @@ done: | |||
269 | This would turn on IM for devices that is not contributing | 269 | This would turn on IM for devices that is not contributing |
270 | to backlog congestion with unnecessary latency. | 270 | to backlog congestion with unnecessary latency. |
271 | 271 | ||
272 | We monitor the the device RX-ring and have: | 272 | We monitor the device RX-ring and have: |
273 | 273 | ||
274 | HW Interrupt Mitigation either ON or OFF. | 274 | HW Interrupt Mitigation either ON or OFF. |
275 | 275 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index fa440706fb4a..38f3b99716b8 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1021,7 +1021,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1021 | np->tx_ring[entry].length |= DescEndRing; | 1021 | np->tx_ring[entry].length |= DescEndRing; |
1022 | 1022 | ||
1023 | /* Now acquire the irq spinlock. | 1023 | /* Now acquire the irq spinlock. |
1024 | * The difficult race is the the ordering between | 1024 | * The difficult race is the ordering between |
1025 | * increasing np->cur_tx and setting DescOwned: | 1025 | * increasing np->cur_tx and setting DescOwned: |
1026 | * - if np->cur_tx is increased first the interrupt | 1026 | * - if np->cur_tx is increased first the interrupt |
1027 | * handler could consider the packet as transmitted | 1027 | * handler could consider the packet as transmitted |
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 985a1810ca59..2470b1ee33c0 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c | |||
@@ -1043,7 +1043,7 @@ static int enable_promisc(struct xircom_private *card) | |||
1043 | 1043 | ||
1044 | 1044 | ||
1045 | /* | 1045 | /* |
1046 | link_status() checks the the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what. | 1046 | link_status() checks the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what. |
1047 | 1047 | ||
1048 | Must be called in locked state with interrupts disabled | 1048 | Must be called in locked state with interrupts disabled |
1049 | */ | 1049 | */ |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index f2dd7763cd0b..f72573594121 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -639,7 +639,7 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd, | |||
639 | 639 | ||
640 | typhoon_inc_cmd_index(&ring->lastWrite, num_cmd); | 640 | typhoon_inc_cmd_index(&ring->lastWrite, num_cmd); |
641 | 641 | ||
642 | /* "I feel a presence... another warrior is on the the mesa." | 642 | /* "I feel a presence... another warrior is on the mesa." |
643 | */ | 643 | */ |
644 | wmb(); | 644 | wmb(); |
645 | iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY); | 645 | iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY); |
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 38fac3bbcd82..7d5b8c2cc614 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c | |||
@@ -149,7 +149,7 @@ static int airport_hard_reset(struct orinoco_private *priv) | |||
149 | /* Vitally important. If we don't do this it seems we get an | 149 | /* Vitally important. If we don't do this it seems we get an |
150 | * interrupt somewhere during the power cycle, since | 150 | * interrupt somewhere during the power cycle, since |
151 | * hw_unavailable is already set it doesn't get ACKed, we get | 151 | * hw_unavailable is already set it doesn't get ACKed, we get |
152 | * into an interrupt loop and the the PMU decides to turn us | 152 | * into an interrupt loop and the PMU decides to turn us |
153 | * off. */ | 153 | * off. */ |
154 | disable_irq(dev->irq); | 154 | disable_irq(dev->irq); |
155 | 155 | ||
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 841b3c136ad9..283be4a70524 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -3054,7 +3054,7 @@ static const iw_handler prism54_handler[] = { | |||
3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ | 3054 | (iw_handler) prism54_set_wap, /* SIOCSIWAP */ |
3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ | 3055 | (iw_handler) prism54_get_wap, /* SIOCGIWAP */ |
3056 | (iw_handler) NULL, /* -- hole -- */ | 3056 | (iw_handler) NULL, /* -- hole -- */ |
3057 | (iw_handler) NULL, /* SIOCGIWAPLIST depreciated */ | 3057 | (iw_handler) NULL, /* SIOCGIWAPLIST deprecated */ |
3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ | 3058 | (iw_handler) prism54_set_scan, /* SIOCSIWSCAN */ |
3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ | 3059 | (iw_handler) prism54_get_scan, /* SIOCGIWSCAN */ |
3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ | 3060 | (iw_handler) prism54_set_essid, /* SIOCSIWESSID */ |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index a037b11dac9d..084795355b74 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -115,7 +115,7 @@ isl_upload_firmware(islpci_private *priv) | |||
115 | ISL38XX_MEMORY_WINDOW_SIZE : fw_len; | 115 | ISL38XX_MEMORY_WINDOW_SIZE : fw_len; |
116 | u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN; | 116 | u32 __iomem *dev_fw_ptr = device_base + ISL38XX_DIRECT_MEM_WIN; |
117 | 117 | ||
118 | /* set the cards base address for writting the data */ | 118 | /* set the card's base address for writing the data */ |
119 | isl38xx_w32_flush(device_base, reg, | 119 | isl38xx_w32_flush(device_base, reg, |
120 | ISL38XX_DIR_MEM_BASE_REG); | 120 | ISL38XX_DIR_MEM_BASE_REG); |
121 | wmb(); /* be paranoid */ | 121 | wmb(); /* be paranoid */ |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 67b867f837ca..5740d4d4267c 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -176,7 +176,7 @@ psa_write(struct net_device * dev, | |||
176 | volatile u_char __iomem *verify = lp->mem + PSA_ADDR + | 176 | volatile u_char __iomem *verify = lp->mem + PSA_ADDR + |
177 | (psaoff(0, psa_comp_number) << 1); | 177 | (psaoff(0, psa_comp_number) << 1); |
178 | 178 | ||
179 | /* Authorize writting to PSA */ | 179 | /* Authorize writing to PSA */ |
180 | hacr_write(base, HACR_PWR_STAT | HACR_ROM_WEN); | 180 | hacr_write(base, HACR_PWR_STAT | HACR_ROM_WEN); |
181 | 181 | ||
182 | while(n-- > 0) | 182 | while(n-- > 0) |
@@ -1676,7 +1676,7 @@ wv_set_frequency(u_long base, /* i/o port of the card */ | |||
1676 | fee_write(base, 0x60, | 1676 | fee_write(base, 0x60, |
1677 | dac, 2); | 1677 | dac, 2); |
1678 | 1678 | ||
1679 | /* We now should verify here that the EEprom writting was ok */ | 1679 | /* We now should verify here that the EEprom writing was ok */ |
1680 | 1680 | ||
1681 | /* ReRead the first area */ | 1681 | /* ReRead the first area */ |
1682 | fee_read(base, 0x00, | 1682 | fee_read(base, 0x00, |
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index 4d1c4905c749..4b9de0093a7b 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h | |||
@@ -120,7 +120,7 @@ | |||
120 | * the Wavelan itself (NCR -> AT&T -> Lucent). | 120 | * the Wavelan itself (NCR -> AT&T -> Lucent). |
121 | * | 121 | * |
122 | * All started with Anders Klemets <klemets@paul.rutgers.edu>, | 122 | * All started with Anders Klemets <klemets@paul.rutgers.edu>, |
123 | * writting a Wavelan ISA driver for the MACH microkernel. Girish | 123 | * writing a Wavelan ISA driver for the MACH microkernel. Girish |
124 | * Welling <welling@paul.rutgers.edu> had also worked on it. | 124 | * Welling <welling@paul.rutgers.edu> had also worked on it. |
125 | * Keith Moore modify this for the Pcmcia hardware. | 125 | * Keith Moore modify this for the Pcmcia hardware. |
126 | * | 126 | * |
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 3f4a7cf9efea..f2a90a7fa2d6 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -109,7 +109,6 @@ static int gx_fix; | |||
109 | /* These identify the driver base version and may not be removed. */ | 109 | /* These identify the driver base version and may not be removed. */ |
110 | static char version[] __devinitdata = | 110 | static char version[] __devinitdata = |
111 | KERN_INFO DRV_NAME ".c:v1.05 1/09/2001 Written by Donald Becker <becker@scyld.com>\n" | 111 | KERN_INFO DRV_NAME ".c:v1.05 1/09/2001 Written by Donald Becker <becker@scyld.com>\n" |
112 | KERN_INFO " http://www.scyld.com/network/yellowfin.html\n" | ||
113 | KERN_INFO " (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n"; | 112 | KERN_INFO " (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n"; |
114 | 113 | ||
115 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); | 114 | MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 3bb7739d26a5..8e58ea3d95c0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -119,7 +119,7 @@ static inline int pci_create_newid_file(struct pci_driver *drv) | |||
119 | * system is in its list of supported devices. Returns the matching | 119 | * system is in its list of supported devices. Returns the matching |
120 | * pci_device_id structure or %NULL if there is no match. | 120 | * pci_device_id structure or %NULL if there is no match. |
121 | * | 121 | * |
122 | * Depreciated, don't use this as it will not catch any dynamic ids | 122 | * Deprecated, don't use this as it will not catch any dynamic ids |
123 | * that a driver might want to check for. | 123 | * that a driver might want to check for. |
124 | */ | 124 | */ |
125 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, | 125 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 5e439836db2d..76422eded36e 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -98,7 +98,7 @@ config RTC_INTF_DEV_UIE_EMUL | |||
98 | bool "RTC UIE emulation on dev interface" | 98 | bool "RTC UIE emulation on dev interface" |
99 | depends on RTC_INTF_DEV | 99 | depends on RTC_INTF_DEV |
100 | help | 100 | help |
101 | Provides an emulation for RTC_UIE if the underlaying rtc chip | 101 | Provides an emulation for RTC_UIE if the underlying rtc chip |
102 | driver does not expose RTC_UIE ioctls. Those requests generate | 102 | driver does not expose RTC_UIE ioctls. Those requests generate |
103 | once-per-second update interrupts, used for synchronization. | 103 | once-per-second update interrupts, used for synchronization. |
104 | 104 | ||
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c index bbd5b8b66f42..d6b06ab81188 100644 --- a/drivers/s390/char/sclp_rw.c +++ b/drivers/s390/char/sclp_rw.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | /* | 24 | /* |
25 | * The room for the SCCB (only for writing) is not equal to a pages size | 25 | * The room for the SCCB (only for writing) is not equal to a pages size |
26 | * (as it is specified as the maximum size in the the SCLP documentation) | 26 | * (as it is specified as the maximum size in the SCLP documentation) |
27 | * because of the additional data structure described above. | 27 | * because of the additional data structure described above. |
28 | */ | 28 | */ |
29 | #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer)) | 29 | #define MAX_SCCB_ROOM (PAGE_SIZE - sizeof(struct sclp_buffer)) |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 29d176036e5c..0b96d49dd636 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -2860,7 +2860,7 @@ qeth_flush_buffers(struct qeth_qdio_out_q *queue, int under_int, | |||
2860 | if (!atomic_read(&queue->set_pci_flags_count)){ | 2860 | if (!atomic_read(&queue->set_pci_flags_count)){ |
2861 | /* | 2861 | /* |
2862 | * there's no outstanding PCI any more, so we | 2862 | * there's no outstanding PCI any more, so we |
2863 | * have to request a PCI to be sure the the PCI | 2863 | * have to request a PCI to be sure that the PCI |
2864 | * will wake at some time in the future then we | 2864 | * will wake at some time in the future then we |
2865 | * can flush packed buffers that might still be | 2865 | * can flush packed buffers that might still be |
2866 | * hanging around, which can happen if no | 2866 | * hanging around, which can happen if no |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index cb08ca3cc0f9..bdf5782b8a7a 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
@@ -222,7 +222,7 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, unsigned int status, | |||
222 | * Since we have been using this adapter, it is save to assume | 222 | * Since we have been using this adapter, it is save to assume |
223 | * that it is not failed but recoverable. The card seems to | 223 | * that it is not failed but recoverable. The card seems to |
224 | * report link-up events by self-initiated queue shutdown. | 224 | * report link-up events by self-initiated queue shutdown. |
225 | * That is why we need to clear the the link-down flag | 225 | * That is why we need to clear the link-down flag |
226 | * which is set again in case we have missed by a mile. | 226 | * which is set again in case we have missed by a mile. |
227 | */ | 227 | */ |
228 | zfcp_erp_adapter_reopen( | 228 | zfcp_erp_adapter_reopen( |
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 74b999d77bbf..4fab0c23814c 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c | |||
@@ -156,7 +156,7 @@ static unsigned short get_pins(unsigned minor) | |||
156 | #define BPP_ICR 0x18 | 156 | #define BPP_ICR 0x18 |
157 | #define BPP_SIZE 0x1A | 157 | #define BPP_SIZE 0x1A |
158 | 158 | ||
159 | /* BPP_CSR. Bits of type RW1 are cleared with writting '1'. */ | 159 | /* BPP_CSR. Bits of type RW1 are cleared with writing '1'. */ |
160 | #define P_DEV_ID_MASK 0xf0000000 /* R */ | 160 | #define P_DEV_ID_MASK 0xf0000000 /* R */ |
161 | #define P_DEV_ID_ZEBRA 0x40000000 | 161 | #define P_DEV_ID_ZEBRA 0x40000000 |
162 | #define P_DEV_ID_L64854 0xa0000000 /* == NCR 89C100+89C105. Pity. */ | 162 | #define P_DEV_ID_L64854 0xa0000000 /* == NCR 89C100+89C105. Pity. */ |
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c index 8d72bbae96ad..0bada0028aa0 100644 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c | |||
@@ -966,7 +966,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd) | |||
966 | | AHD_BUSFREEREV_BUG; | 966 | | AHD_BUSFREEREV_BUG; |
967 | ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG; | 967 | ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG; |
968 | 968 | ||
969 | /* If the user requested the the SLOWCRC bit to be set. */ | 969 | /* If the user requested that the SLOWCRC bit to be set. */ |
970 | if (aic79xx_slowcrc) | 970 | if (aic79xx_slowcrc) |
971 | ahd->features |= AHD_AIC79XXB_SLOWCRC; | 971 | ahd->features |= AHD_AIC79XXB_SLOWCRC; |
972 | 972 | ||
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile index e6b70123940c..e78ce0fa44d2 100644 --- a/drivers/scsi/aic94xx/Makefile +++ b/drivers/scsi/aic94xx/Makefile | |||
@@ -6,7 +6,7 @@ | |||
6 | # | 6 | # |
7 | # This file is licensed under GPLv2. | 7 | # This file is licensed under GPLv2. |
8 | # | 8 | # |
9 | # This file is part of the the aic94xx driver. | 9 | # This file is part of the aic94xx driver. |
10 | # | 10 | # |
11 | # The aic94xx driver is free software; you can redistribute it and/or | 11 | # The aic94xx driver is free software; you can redistribute it and/or |
12 | # modify it under the terms of the GNU General Public License as | 12 | # modify it under the terms of the GNU General Public License as |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index a965ed3548d5..564ea90ed3a0 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -541,7 +541,7 @@ static struct ParameterData __devinitdata cfg_data[] = { | |||
541 | 541 | ||
542 | 542 | ||
543 | /* | 543 | /* |
544 | * Safe settings. If set to zero the the BIOS/default values with | 544 | * Safe settings. If set to zero the BIOS/default values with |
545 | * command line overrides will be used. If set to 1 then safe and | 545 | * command line overrides will be used. If set to 1 then safe and |
546 | * slow settings will be used. | 546 | * slow settings will be used. |
547 | */ | 547 | */ |
@@ -617,7 +617,7 @@ static void __devinit fix_settings(void) | |||
617 | 617 | ||
618 | /* | 618 | /* |
619 | * Mapping from the eeprom delay index value (index into this array) | 619 | * Mapping from the eeprom delay index value (index into this array) |
620 | * to the the number of actual seconds that the delay should be for. | 620 | * to the number of actual seconds that the delay should be for. |
621 | */ | 621 | */ |
622 | static char __devinitdata eeprom_index_to_delay_map[] = | 622 | static char __devinitdata eeprom_index_to_delay_map[] = |
623 | { 1, 3, 5, 10, 16, 30, 60, 120 }; | 623 | { 1, 3, 5, 10, 16, 30, 60, 120 }; |
@@ -4136,7 +4136,7 @@ static void __devinit trms1040_write_all(struct NvRamType *eeprom, unsigned long | |||
4136 | * @io_port: base I/O address | 4136 | * @io_port: base I/O address |
4137 | * @addr: offset into SEEPROM | 4137 | * @addr: offset into SEEPROM |
4138 | * | 4138 | * |
4139 | * Returns the the byte read. | 4139 | * Returns the byte read. |
4140 | **/ | 4140 | **/ |
4141 | static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr) | 4141 | static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr) |
4142 | { | 4142 | { |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 61fbcdcbb009..1f5a07bf2a75 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -173,7 +173,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) | |||
173 | * @retries: number of times to retry request | 173 | * @retries: number of times to retry request |
174 | * @flags: or into request flags; | 174 | * @flags: or into request flags; |
175 | * | 175 | * |
176 | * returns the req->errors value which is the the scsi_cmnd result | 176 | * returns the req->errors value which is the scsi_cmnd result |
177 | * field. | 177 | * field. |
178 | **/ | 178 | **/ |
179 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, | 179 | int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, |
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index b5332e679c46..88fb56d5db8f 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -1307,7 +1307,7 @@ static int auerswald_addservice (pauerswald_t cp, pauerscon_t scp) | |||
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | 1309 | ||
1310 | /* remove a service from the the device | 1310 | /* remove a service from the device |
1311 | scp->id must be set! */ | 1311 | scp->id must be set! */ |
1312 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp) | 1312 | static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp) |
1313 | { | 1313 | { |
diff --git a/drivers/usb/net/usbnet.h b/drivers/usb/net/usbnet.h index cbb53e065d6c..82db5a8e528e 100644 --- a/drivers/usb/net/usbnet.h +++ b/drivers/usb/net/usbnet.h | |||
@@ -129,7 +129,7 @@ extern void usbnet_disconnect(struct usb_interface *); | |||
129 | 129 | ||
130 | 130 | ||
131 | /* Drivers that reuse some of the standard USB CDC infrastructure | 131 | /* Drivers that reuse some of the standard USB CDC infrastructure |
132 | * (notably, using multiple interfaces according to the the CDC | 132 | * (notably, using multiple interfaces according to the CDC |
133 | * union descriptor) get some helper code. | 133 | * union descriptor) get some helper code. |
134 | */ | 134 | */ |
135 | struct cdc_state { | 135 | struct cdc_state { |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index ba5d1dc03036..3efe67092f15 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -558,7 +558,7 @@ config USB_SERIAL_DEBUG | |||
558 | tristate "USB Debugging Device" | 558 | tristate "USB Debugging Device" |
559 | depends on USB_SERIAL | 559 | depends on USB_SERIAL |
560 | help | 560 | help |
561 | Say Y here if you have a USB debugging device used to recieve | 561 | Say Y here if you have a USB debugging device used to receive |
562 | debugging data from another machine. The most common of these | 562 | debugging data from another machine. The most common of these |
563 | devices is the NetChip TurboCONNECT device. | 563 | devices is the NetChip TurboCONNECT device. |
564 | 564 | ||
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index b675735bfbee..fbc8c27d5d99 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * The device works as an standard CDC device, it has 2 interfaces, the first | 9 | * The device works as an standard CDC device, it has 2 interfaces, the first |
10 | * one is for firmware access and the second is the serial one. | 10 | * one is for firmware access and the second is the serial one. |
11 | * The protocol is very simply, there are two posibilities reading or writing. | 11 | * The protocol is very simply, there are two posibilities reading or writing. |
12 | * When writting the first urb must have a Header that starts with 0x20 0x29 the | 12 | * When writing the first urb must have a Header that starts with 0x20 0x29 the |
13 | * next two bytes must say how much data will be sended. | 13 | * next two bytes must say how much data will be sended. |
14 | * When reading the process is almost equal except that the header starts with | 14 | * When reading the process is almost equal except that the header starts with |
15 | * 0x00 0x20. | 15 | * 0x00 0x20. |
@@ -18,7 +18,7 @@ | |||
18 | * buffer: The First and Second byte is used for a Header, the Third and Fourth | 18 | * buffer: The First and Second byte is used for a Header, the Third and Fourth |
19 | * tells the device the amount of information the package holds. | 19 | * tells the device the amount of information the package holds. |
20 | * Packages are 60 bytes long Header Stuff. | 20 | * Packages are 60 bytes long Header Stuff. |
21 | * When writting to the device the first two bytes of the header are 0x20 0x29 | 21 | * When writing to the device the first two bytes of the header are 0x20 0x29 |
22 | * When reading the bytes are 0x00 0x20, or 0x00 0x10, there is an strange | 22 | * When reading the bytes are 0x00 0x20, or 0x00 0x10, there is an strange |
23 | * situation, when too much data arrives to the device because it sends the data | 23 | * situation, when too much data arrives to the device because it sends the data |
24 | * but with out the header. I will use a simply hack to override this situation, | 24 | * but with out the header. I will use a simply hack to override this situation, |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 18f74ac76565..4807f960150b 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2465,7 +2465,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r | |||
2465 | ((edge_serial->is_epic) && | 2465 | ((edge_serial->is_epic) && |
2466 | (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) && | 2466 | (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) && |
2467 | (regNum == MCR))) { | 2467 | (regNum == MCR))) { |
2468 | dbg("SendCmdWriteUartReg - Not writting to MCR Register"); | 2468 | dbg("SendCmdWriteUartReg - Not writing to MCR Register"); |
2469 | return 0; | 2469 | return 0; |
2470 | } | 2470 | } |
2471 | 2471 | ||
@@ -2473,7 +2473,7 @@ static int send_cmd_write_uart_register (struct edgeport_port *edge_port, __u8 r | |||
2473 | ((edge_serial->is_epic) && | 2473 | ((edge_serial->is_epic) && |
2474 | (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) && | 2474 | (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) && |
2475 | (regNum == LCR))) { | 2475 | (regNum == LCR))) { |
2476 | dbg ("SendCmdWriteUartReg - Not writting to LCR Register"); | 2476 | dbg ("SendCmdWriteUartReg - Not writing to LCR Register"); |
2477 | return 0; | 2477 | return 0; |
2478 | } | 2478 | } |
2479 | 2479 | ||
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c index f577bd80e020..03cfb7ac5733 100644 --- a/drivers/video/console/softcursor.c +++ b/drivers/video/console/softcursor.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/video/softcursor.c | 2 | * linux/drivers/video/console/softcursor.c |
3 | * | 3 | * |
4 | * Generic software cursor for frame buffer devices | 4 | * Generic software cursor for frame buffer devices |
5 | * | 5 | * |
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index 7e760197cf29..1a7d7789d877 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
@@ -1717,7 +1717,7 @@ static int __devinit i810_alloc_agp_mem(struct fb_info *info) | |||
1717 | * @info: pointer to device specific info structure | 1717 | * @info: pointer to device specific info structure |
1718 | * | 1718 | * |
1719 | * DESCRIPTION: | 1719 | * DESCRIPTION: |
1720 | * Sets the the user monitor's horizontal and vertical | 1720 | * Sets the user monitor's horizontal and vertical |
1721 | * frequency limits | 1721 | * frequency limits |
1722 | */ | 1722 | */ |
1723 | static void __devinit i810_init_monspecs(struct fb_info *info) | 1723 | static void __devinit i810_init_monspecs(struct fb_info *info) |
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c index a5690a5f29d5..9445cdb759b1 100644 --- a/drivers/video/matrox/matroxfb_Ti3026.c +++ b/drivers/video/matrox/matroxfb_Ti3026.c | |||
@@ -72,7 +72,7 @@ | |||
72 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 72 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
73 | * | 73 | * |
74 | * (following author is not in any relation with this code, but his ideas | 74 | * (following author is not in any relation with this code, but his ideas |
75 | * were used when writting this driver) | 75 | * were used when writing this driver) |
76 | * | 76 | * |
77 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 77 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
78 | * | 78 | * |
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c index a5c825d99466..c57aaadf410c 100644 --- a/drivers/video/matrox/matroxfb_accel.c +++ b/drivers/video/matrox/matroxfb_accel.c | |||
@@ -70,7 +70,7 @@ | |||
70 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 70 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
71 | * | 71 | * |
72 | * (following author is not in any relation with this code, but his ideas | 72 | * (following author is not in any relation with this code, but his ideas |
73 | * were used when writting this driver) | 73 | * were used when writing this driver) |
74 | * | 74 | * |
75 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 75 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
76 | * | 76 | * |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index cb2aa402ddfd..c8559a756b75 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -93,7 +93,7 @@ | |||
93 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 93 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
94 | * | 94 | * |
95 | * (following author is not in any relation with this code, but his ideas | 95 | * (following author is not in any relation with this code, but his ideas |
96 | * were used when writting this driver) | 96 | * were used when writing this driver) |
97 | * | 97 | * |
98 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 98 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
99 | * | 99 | * |
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index 18886b629cb1..5948e54b9ef9 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c | |||
@@ -78,7 +78,7 @@ | |||
78 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> | 78 | * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> |
79 | * | 79 | * |
80 | * (following author is not in any relation with this code, but his ideas | 80 | * (following author is not in any relation with this code, but his ideas |
81 | * were used when writting this driver) | 81 | * were used when writing this driver) |
82 | * | 82 | * |
83 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> | 83 | * FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk> |
84 | * | 84 | * |
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c index 842b5cd054c6..836a612af977 100644 --- a/drivers/video/skeletonfb.c +++ b/drivers/video/skeletonfb.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * of it. | 14 | * of it. |
15 | * | 15 | * |
16 | * First the roles of struct fb_info and struct display have changed. Struct | 16 | * First the roles of struct fb_info and struct display have changed. Struct |
17 | * display will go away. The way the the new framebuffer console code will | 17 | * display will go away. The way the new framebuffer console code will |
18 | * work is that it will act to translate data about the tty/console in | 18 | * work is that it will act to translate data about the tty/console in |
19 | * struct vc_data to data in a device independent way in struct fb_info. Then | 19 | * struct vc_data to data in a device independent way in struct fb_info. Then |
20 | * various functions in struct fb_ops will be called to store the device | 20 | * various functions in struct fb_ops will be called to store the device |