diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-02-02 19:01:28 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-09 05:13:56 -0500 |
commit | 3ad2f3fbb961429d2aa627465ae4829758bc7e07 (patch) | |
tree | f365c513e8f5b477a61336a600ff54f32b7ad6e1 /drivers | |
parent | 1537a3638cbf741d3826c1002026cce487a6bee0 (diff) |
tree-wide: Assorted spelling fixes
In particular, several occurances of funny versions of 'success',
'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
'beginning', 'desirable', 'separate' and 'necessary' are fixed.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Joe Perches <joe@perches.com>
Cc: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
81 files changed, 102 insertions, 102 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index bbc2c1315c47..d7f363f9435f 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
@@ -605,7 +605,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, | |||
605 | list_for_each_entry(dock_station, &dock_stations, sibling) { | 605 | list_for_each_entry(dock_station, &dock_stations, sibling) { |
606 | /* | 606 | /* |
607 | * An ATA bay can be in a dock and itself can be ejected | 607 | * An ATA bay can be in a dock and itself can be ejected |
608 | * seperately, so there are two 'dock stations' which need the | 608 | * separately, so there are two 'dock stations' which need the |
609 | * ops | 609 | * ops |
610 | */ | 610 | */ |
611 | dd = find_dock_dependent_device(dock_station, handle); | 611 | dd = find_dock_dependent_device(dock_station, handle); |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 741065c9da67..7f2c94a07c00 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -2258,7 +2258,7 @@ EXPORT_SYMBOL_GPL(ata_sff_postreset); | |||
2258 | * @qc: command | 2258 | * @qc: command |
2259 | * | 2259 | * |
2260 | * Drain the FIFO and device of any stuck data following a command | 2260 | * Drain the FIFO and device of any stuck data following a command |
2261 | * failing to complete. In some cases this is neccessary before a | 2261 | * failing to complete. In some cases this is necessary before a |
2262 | * reset will recover the device. | 2262 | * reset will recover the device. |
2263 | * | 2263 | * |
2264 | */ | 2264 | */ |
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index d8f35fe44421..9e33da9565d9 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
@@ -161,7 +161,7 @@ static void pacpi_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
161 | * | 161 | * |
162 | * Called when the libata layer is about to issue a command. We wrap | 162 | * Called when the libata layer is about to issue a command. We wrap |
163 | * this interface so that we can load the correct ATA timings if | 163 | * this interface so that we can load the correct ATA timings if |
164 | * neccessary. | 164 | * necessary. |
165 | */ | 165 | */ |
166 | 166 | ||
167 | static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) | 167 | static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) |
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c index c86c71639a95..727a81ce4c9f 100644 --- a/drivers/ata/pata_hpt3x3.c +++ b/drivers/ata/pata_hpt3x3.c | |||
@@ -180,7 +180,7 @@ static void hpt3x3_init_chipset(struct pci_dev *dev) | |||
180 | * @id: Entry in match table | 180 | * @id: Entry in match table |
181 | * | 181 | * |
182 | * Perform basic initialisation. We set the device up so we access all | 182 | * Perform basic initialisation. We set the device up so we access all |
183 | * ports via BAR4. This is neccessary to work around errata. | 183 | * ports via BAR4. This is necessary to work around errata. |
184 | */ | 184 | */ |
185 | 185 | ||
186 | static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 186 | static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) |
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 1b392c9e8531..416aebb8b913 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -131,7 +131,7 @@ static unsigned int ata_data_xfer_8bit(struct ata_device *dev, | |||
131 | * @qc: command | 131 | * @qc: command |
132 | * | 132 | * |
133 | * Drain the FIFO and device of any stuck data following a command | 133 | * Drain the FIFO and device of any stuck data following a command |
134 | * failing to complete. In some cases this is neccessary before a | 134 | * failing to complete. In some cases this is necessary before a |
135 | * reset will recover the device. | 135 | * reset will recover the device. |
136 | * | 136 | * |
137 | */ | 137 | */ |
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 2bf3a6ef3684..d9301e861d9f 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -95,7 +95,7 @@ extern char usermode_helper[]; | |||
95 | 95 | ||
96 | /* All EEs on the free list should have ID_VACANT (== 0) | 96 | /* All EEs on the free list should have ID_VACANT (== 0) |
97 | * freshly allocated EEs get !ID_VACANT (== 1) | 97 | * freshly allocated EEs get !ID_VACANT (== 1) |
98 | * so if it says "cannot dereference null pointer at adress 0x00000001", | 98 | * so if it says "cannot dereference null pointer at address 0x00000001", |
99 | * it is most likely one of these :( */ | 99 | * it is most likely one of these :( */ |
100 | 100 | ||
101 | #define ID_IN_SYNC (4711ULL) | 101 | #define ID_IN_SYNC (4711ULL) |
@@ -1171,7 +1171,7 @@ extern int drbd_bitmap_io(struct drbd_conf *mdev, int (*io_fn)(struct drbd_conf | |||
1171 | /* Meta data layout | 1171 | /* Meta data layout |
1172 | We reserve a 128MB Block (4k aligned) | 1172 | We reserve a 128MB Block (4k aligned) |
1173 | * either at the end of the backing device | 1173 | * either at the end of the backing device |
1174 | * or on a seperate meta data device. */ | 1174 | * or on a separate meta data device. */ |
1175 | 1175 | ||
1176 | #define MD_RESERVED_SECT (128LU << 11) /* 128 MB, unit sectors */ | 1176 | #define MD_RESERVED_SECT (128LU << 11) /* 128 MB, unit sectors */ |
1177 | /* The following numbers are sectors */ | 1177 | /* The following numbers are sectors */ |
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h index f22c1bc8ec7e..16119d7056cc 100644 --- a/drivers/block/drbd/drbd_req.h +++ b/drivers/block/drbd/drbd_req.h | |||
@@ -57,7 +57,7 @@ | |||
57 | * | 57 | * |
58 | * It may me handed over to the local disk subsystem. | 58 | * It may me handed over to the local disk subsystem. |
59 | * It may be completed by the local disk subsystem, | 59 | * It may be completed by the local disk subsystem, |
60 | * either sucessfully or with io-error. | 60 | * either successfully or with io-error. |
61 | * In case it is a READ request, and it failed locally, | 61 | * In case it is a READ request, and it failed locally, |
62 | * it may be retried remotely. | 62 | * it may be retried remotely. |
63 | * | 63 | * |
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 3999a5f25f38..45a22f9bfec2 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
@@ -269,7 +269,7 @@ static void intel_agp_insert_sg_entries(struct agp_memory *mem, | |||
269 | j++; | 269 | j++; |
270 | } | 270 | } |
271 | } else { | 271 | } else { |
272 | /* sg may merge pages, but we have to seperate | 272 | /* sg may merge pages, but we have to separate |
273 | * per-page addr for GTT */ | 273 | * per-page addr for GTT */ |
274 | unsigned int len, m; | 274 | unsigned int len, m; |
275 | 275 | ||
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index fe2cb2f5db17..a7424bf7eacf 100644 --- a/drivers/char/applicom.c +++ b/drivers/char/applicom.c | |||
@@ -14,7 +14,7 @@ | |||
14 | /* et passe en argument a acinit, mais est scrute sur le bus pour s'adapter */ | 14 | /* et passe en argument a acinit, mais est scrute sur le bus pour s'adapter */ |
15 | /* au nombre de cartes presentes sur le bus. IOCL code 6 affichait V2.4.3 */ | 15 | /* au nombre de cartes presentes sur le bus. IOCL code 6 affichait V2.4.3 */ |
16 | /* F.LAFORSE 28/11/95 creation de fichiers acXX.o avec les differentes */ | 16 | /* F.LAFORSE 28/11/95 creation de fichiers acXX.o avec les differentes */ |
17 | /* adresses de base des cartes, IOCTL 6 plus complet */ | 17 | /* addresses de base des cartes, IOCTL 6 plus complet */ |
18 | /* J.PAGET le 19/08/96 copie de la version V2.6 en V2.8.0 sans modification */ | 18 | /* J.PAGET le 19/08/96 copie de la version V2.6 en V2.8.0 sans modification */ |
19 | /* de code autre que le texte V2.6.1 en V2.8.0 */ | 19 | /* de code autre que le texte V2.6.1 en V2.8.0 */ |
20 | /*****************************************************************************/ | 20 | /*****************************************************************************/ |
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index 936d05bf37fa..0794925d8042 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c | |||
@@ -353,7 +353,7 @@ static void hvc_close_event(struct HvLpEvent *event) | |||
353 | 353 | ||
354 | if (!hvlpevent_is_int(event)) { | 354 | if (!hvlpevent_is_int(event)) { |
355 | printk(KERN_WARNING | 355 | printk(KERN_WARNING |
356 | "hvc: got unexpected close acknowlegement\n"); | 356 | "hvc: got unexpected close acknowledgement\n"); |
357 | return; | 357 | return; |
358 | } | 358 | } |
359 | 359 | ||
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index 9b3e09cd41f9..10f868eefaa6 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c | |||
@@ -71,7 +71,7 @@ MODULE_VERSION(DRV_MODULE_VERSION); | |||
71 | * x22 + x21 + x17 + x15 + x13 + x12 + x11 + x7 + x5 + x + 1 | 71 | * x22 + x21 + x17 + x15 + x13 + x12 + x11 + x7 + x5 + x + 1 |
72 | * | 72 | * |
73 | * The RNG_CTL_VCO value of each noise cell must be programmed | 73 | * The RNG_CTL_VCO value of each noise cell must be programmed |
74 | * seperately. This is why 4 control register values must be provided | 74 | * separately. This is why 4 control register values must be provided |
75 | * to the hypervisor. During a write, the hypervisor writes them all, | 75 | * to the hypervisor. During a write, the hypervisor writes them all, |
76 | * one at a time, to the actual RNG_CTL register. The first three | 76 | * one at a time, to the actual RNG_CTL register. The first three |
77 | * values are used to setup the desired RNG_CTL_VCO for each entropy | 77 | * values are used to setup the desired RNG_CTL_VCO for each entropy |
diff --git a/drivers/char/ip2/i2hw.h b/drivers/char/ip2/i2hw.h index 8aa6e7ab8d5b..c0ba6c05f0cd 100644 --- a/drivers/char/ip2/i2hw.h +++ b/drivers/char/ip2/i2hw.h | |||
@@ -559,7 +559,7 @@ Loadware may be sent to the board in two ways: | |||
559 | 559 | ||
560 | 2) It may be hard-coded into your source by including a .h file (typically | 560 | 2) It may be hard-coded into your source by including a .h file (typically |
561 | supplied by Computone), which declares a data array and initializes every | 561 | supplied by Computone), which declares a data array and initializes every |
562 | element. This acheives the same result as if an entire loadware file had | 562 | element. This achieves the same result as if an entire loadware file had |
563 | been read into the array. | 563 | been read into the array. |
564 | 564 | ||
565 | This requires more data space in your program, but access to the file system | 565 | This requires more data space in your program, but access to the file system |
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 385c44b3034f..5ee424817263 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
@@ -220,7 +220,7 @@ static void pty_set_termios(struct tty_struct *tty, | |||
220 | * @tty: tty being resized | 220 | * @tty: tty being resized |
221 | * @ws: window size being set. | 221 | * @ws: window size being set. |
222 | * | 222 | * |
223 | * Update the termios variables and send the neccessary signals to | 223 | * Update the termios variables and send the necessary signals to |
224 | * peform a terminal resize correctly | 224 | * peform a terminal resize correctly |
225 | */ | 225 | */ |
226 | 226 | ||
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index c6f3b48be9dd..56b11c1c7aeb 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -2026,7 +2026,7 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg) | |||
2026 | * @rows: rows (character) | 2026 | * @rows: rows (character) |
2027 | * @cols: cols (character) | 2027 | * @cols: cols (character) |
2028 | * | 2028 | * |
2029 | * Update the termios variables and send the neccessary signals to | 2029 | * Update the termios variables and send the necessary signals to |
2030 | * peform a terminal resize correctly | 2030 | * peform a terminal resize correctly |
2031 | */ | 2031 | */ |
2032 | 2032 | ||
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 94f530a29691..bd1d1164fec5 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -821,7 +821,7 @@ static inline int resize_screen(struct vc_data *vc, int width, int height, | |||
821 | * | 821 | * |
822 | * Resize a virtual console, clipping according to the actual constraints. | 822 | * Resize a virtual console, clipping according to the actual constraints. |
823 | * If the caller passes a tty structure then update the termios winsize | 823 | * If the caller passes a tty structure then update the termios winsize |
824 | * information and perform any neccessary signal handling. | 824 | * information and perform any necessary signal handling. |
825 | * | 825 | * |
826 | * Caller must hold the console semaphore. Takes the termios mutex and | 826 | * Caller must hold the console semaphore. Takes the termios mutex and |
827 | * ctrl_lock of the tty IFF a tty is passed. | 827 | * ctrl_lock of the tty IFF a tty is passed. |
diff --git a/drivers/dma/coh901318_lli.h b/drivers/dma/coh901318_lli.h index 7bf713b79c6b..7a5c80990e9e 100644 --- a/drivers/dma/coh901318_lli.h +++ b/drivers/dma/coh901318_lli.h | |||
@@ -30,7 +30,7 @@ struct device; | |||
30 | * @pool: pool handle | 30 | * @pool: pool handle |
31 | * @dev: dma device | 31 | * @dev: dma device |
32 | * @lli_nbr: number of lli:s in the pool | 32 | * @lli_nbr: number of lli:s in the pool |
33 | * @algin: adress alignemtn of lli:s | 33 | * @algin: address alignemtn of lli:s |
34 | * returns 0 on success otherwise none zero | 34 | * returns 0 on success otherwise none zero |
35 | */ | 35 | */ |
36 | int coh901318_pool_create(struct coh901318_pool *pool, | 36 | int coh901318_pool_create(struct coh901318_pool *pool, |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index d7f8d8b4a4b8..52fb371784e1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -3544,7 +3544,7 @@ int nouveau_bios_parse_lvds_table(struct drm_device *dev, int pxclk, bool *dl, b | |||
3544 | * at which modes should be set up in the dual link style. | 3544 | * at which modes should be set up in the dual link style. |
3545 | * | 3545 | * |
3546 | * Following the header, the BMP (ver 0xa) table has several records, | 3546 | * Following the header, the BMP (ver 0xa) table has several records, |
3547 | * indexed by a seperate xlat table, indexed in turn by the fp strap in | 3547 | * indexed by a separate xlat table, indexed in turn by the fp strap in |
3548 | * EXTDEV_BOOT. Each record had a config byte, followed by 6 script | 3548 | * EXTDEV_BOOT. Each record had a config byte, followed by 6 script |
3549 | * numbers for use by INIT_SUB which controlled panel init and power, | 3549 | * numbers for use by INIT_SUB which controlled panel init and power, |
3550 | * and finally a dword of ms to sleep between power off and on | 3550 | * and finally a dword of ms to sleep between power off and on |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 6b9690418bc7..23664058690f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -544,7 +544,7 @@ struct drm_nouveau_private { | |||
544 | uint32_t ramro_offset; | 544 | uint32_t ramro_offset; |
545 | uint32_t ramro_size; | 545 | uint32_t ramro_size; |
546 | 546 | ||
547 | /* base physical adresses */ | 547 | /* base physical addresses */ |
548 | uint64_t fb_phys; | 548 | uint64_t fb_phys; |
549 | uint64_t fb_available_size; | 549 | uint64_t fb_available_size; |
550 | uint64_t fb_mappable_pages; | 550 | uint64_t fb_mappable_pages; |
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index 5935b8842e86..34079f251cd4 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c | |||
@@ -150,7 +150,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) | |||
150 | cur_irq++; | 150 | cur_irq++; |
151 | } | 151 | } |
152 | 152 | ||
153 | /* Acknowlege interrupts */ | 153 | /* Acknowledge interrupts */ |
154 | VIA_WRITE(VIA_REG_INTERRUPT, status); | 154 | VIA_WRITE(VIA_REG_INTERRUPT, status); |
155 | 155 | ||
156 | 156 | ||
@@ -165,7 +165,7 @@ static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv) | |||
165 | u32 status; | 165 | u32 status; |
166 | 166 | ||
167 | if (dev_priv) { | 167 | if (dev_priv) { |
168 | /* Acknowlege interrupts */ | 168 | /* Acknowledge interrupts */ |
169 | status = VIA_READ(VIA_REG_INTERRUPT); | 169 | status = VIA_READ(VIA_REG_INTERRUPT); |
170 | VIA_WRITE(VIA_REG_INTERRUPT, status | | 170 | VIA_WRITE(VIA_REG_INTERRUPT, status | |
171 | dev_priv->irq_pending_mask); | 171 | dev_priv->irq_pending_mask); |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 7647a20523a0..90ffbf6f9d4f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * | 12 | * |
13 | * History: | 13 | * History: |
14 | * Apr 2002: Initial version [CS] | 14 | * Apr 2002: Initial version [CS] |
15 | * Jun 2002: Properly seperated algo/adap [FB] | 15 | * Jun 2002: Properly separated algo/adap [FB] |
16 | * Jan 2003: Fixed several bugs concerning interrupt handling [Kai-Uwe Bloem] | 16 | * Jan 2003: Fixed several bugs concerning interrupt handling [Kai-Uwe Bloem] |
17 | * Jan 2003: added limited signal handling [Kai-Uwe Bloem] | 17 | * Jan 2003: added limited signal handling [Kai-Uwe Bloem] |
18 | * Sep 2004: Major rework to ensure efficient bus handling [RMK] | 18 | * Sep 2004: Major rework to ensure efficient bus handling [RMK] |
diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h b/drivers/infiniband/hw/ehca/ehca_qes.h index 5d28e3e98a20..90c4efa67586 100644 --- a/drivers/infiniband/hw/ehca/ehca_qes.h +++ b/drivers/infiniband/hw/ehca/ehca_qes.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | #include "ehca_tools.h" | 47 | #include "ehca_tools.h" |
48 | 48 | ||
49 | /* virtual scatter gather entry to specify remote adresses with length */ | 49 | /* virtual scatter gather entry to specify remote addresses with length */ |
50 | struct ehca_vsgentry { | 50 | struct ehca_vsgentry { |
51 | u64 vaddr; | 51 | u64 vaddr; |
52 | u32 lkey; | 52 | u32 lkey; |
@@ -148,7 +148,7 @@ struct ehca_wqe { | |||
148 | u32 immediate_data; | 148 | u32 immediate_data; |
149 | union { | 149 | union { |
150 | struct { | 150 | struct { |
151 | u64 remote_virtual_adress; | 151 | u64 remote_virtual_address; |
152 | u32 rkey; | 152 | u32 rkey; |
153 | u32 reserved; | 153 | u32 reserved; |
154 | u64 atomic_1st_op_dma_len; | 154 | u64 atomic_1st_op_dma_len; |
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c index e3ec7fdd67bd..9a3fbfca9b41 100644 --- a/drivers/infiniband/hw/ehca/ehca_reqs.c +++ b/drivers/infiniband/hw/ehca/ehca_reqs.c | |||
@@ -269,7 +269,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp, | |||
269 | /* no break is intentional here */ | 269 | /* no break is intentional here */ |
270 | case IB_QPT_RC: | 270 | case IB_QPT_RC: |
271 | /* TODO: atomic not implemented */ | 271 | /* TODO: atomic not implemented */ |
272 | wqe_p->u.nud.remote_virtual_adress = | 272 | wqe_p->u.nud.remote_virtual_address = |
273 | send_wr->wr.rdma.remote_addr; | 273 | send_wr->wr.rdma.remote_addr; |
274 | wqe_p->u.nud.rkey = send_wr->wr.rdma.rkey; | 274 | wqe_p->u.nud.rkey = send_wr->wr.rdma.rkey; |
275 | 275 | ||
diff --git a/drivers/input/misc/yealink.h b/drivers/input/misc/yealink.h index 48af0be9cbdf..1e0f52397010 100644 --- a/drivers/input/misc/yealink.h +++ b/drivers/input/misc/yealink.h | |||
@@ -127,7 +127,7 @@ struct yld_ctl_packet { | |||
127 | * yld_status struct. | 127 | * yld_status struct. |
128 | */ | 128 | */ |
129 | 129 | ||
130 | /* LCD, each segment must be driven seperately. | 130 | /* LCD, each segment must be driven separately. |
131 | * | 131 | * |
132 | * Layout: | 132 | * Layout: |
133 | * | 133 | * |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index adb1e8c36b46..00c60e2e0ff7 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -1347,7 +1347,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) | |||
1347 | /* | 1347 | /* |
1348 | * isdn net devices manage lots of configuration variables as linked lists. | 1348 | * isdn net devices manage lots of configuration variables as linked lists. |
1349 | * Those lists must only be manipulated from user space. Some of the ioctl's | 1349 | * Those lists must only be manipulated from user space. Some of the ioctl's |
1350 | * service routines access user space and are not atomic. Therefor, ioctl's | 1350 | * service routines access user space and are not atomic. Therefore, ioctl's |
1351 | * manipulating the lists and ioctl's sleeping while accessing the lists | 1351 | * manipulating the lists and ioctl's sleeping while accessing the lists |
1352 | * are serialized by means of a semaphore. | 1352 | * are serialized by means of a semaphore. |
1353 | */ | 1353 | */ |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 52e4ce4304ee..80dda308ff74 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -214,14 +214,14 @@ struct dvb_tuner_ops { | |||
214 | int (*get_status)(struct dvb_frontend *fe, u32 *status); | 214 | int (*get_status)(struct dvb_frontend *fe, u32 *status); |
215 | int (*get_rf_strength)(struct dvb_frontend *fe, u16 *strength); | 215 | int (*get_rf_strength)(struct dvb_frontend *fe, u16 *strength); |
216 | 216 | ||
217 | /** These are provided seperately from set_params in order to facilitate silicon | 217 | /** These are provided separately from set_params in order to facilitate silicon |
218 | * tuners which require sophisticated tuning loops, controlling each parameter seperately. */ | 218 | * tuners which require sophisticated tuning loops, controlling each parameter separately. */ |
219 | int (*set_frequency)(struct dvb_frontend *fe, u32 frequency); | 219 | int (*set_frequency)(struct dvb_frontend *fe, u32 frequency); |
220 | int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth); | 220 | int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth); |
221 | 221 | ||
222 | /* | 222 | /* |
223 | * These are provided seperately from set_params in order to facilitate silicon | 223 | * These are provided separately from set_params in order to facilitate silicon |
224 | * tuners which require sophisticated tuning loops, controlling each parameter seperately. | 224 | * tuners which require sophisticated tuning loops, controlling each parameter separately. |
225 | */ | 225 | */ |
226 | int (*set_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state); | 226 | int (*set_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state); |
227 | int (*get_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state); | 227 | int (*get_state)(struct dvb_frontend *fe, enum tuner_param param, struct tuner_state *state); |
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 12279f6d9bc4..716870ae85d5 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -4404,7 +4404,7 @@ static void rv605_muxsel(struct bttv *btv, unsigned int input) | |||
4404 | /* Tibet Systems 'Progress DVR' CS16 muxsel helper [Chris Fanning] | 4404 | /* Tibet Systems 'Progress DVR' CS16 muxsel helper [Chris Fanning] |
4405 | * | 4405 | * |
4406 | * The CS16 (available on eBay cheap) is a PCI board with four Fusion | 4406 | * The CS16 (available on eBay cheap) is a PCI board with four Fusion |
4407 | * 878A chips, a PCI bridge, an Atmel microcontroller, four sync seperator | 4407 | * 878A chips, a PCI bridge, an Atmel microcontroller, four sync separator |
4408 | * chips, ten eight input analog multiplexors, a not chip and a few | 4408 | * chips, ten eight input analog multiplexors, a not chip and a few |
4409 | * other components. | 4409 | * other components. |
4410 | * | 4410 | * |
@@ -4426,7 +4426,7 @@ static void rv605_muxsel(struct bttv *btv, unsigned int input) | |||
4426 | * | 4426 | * |
4427 | * There is an ATMEL microcontroller with an 8031 core on board. I have not | 4427 | * There is an ATMEL microcontroller with an 8031 core on board. I have not |
4428 | * determined what function (if any) it provides. With the microcontroller | 4428 | * determined what function (if any) it provides. With the microcontroller |
4429 | * and sync seperator chips a guess is that it might have to do with video | 4429 | * and sync separator chips a guess is that it might have to do with video |
4430 | * switching and maybe some digital I/O. | 4430 | * switching and maybe some digital I/O. |
4431 | */ | 4431 | */ |
4432 | static void tibetCS16_muxsel(struct bttv *btv, unsigned int input) | 4432 | static void tibetCS16_muxsel(struct bttv *btv, unsigned int input) |
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index b4f965731244..e5e4c4440d39 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -503,7 +503,7 @@ static const struct v4l2_pix_format ovfx2_ov3610_mode[] = { | |||
503 | /* | 503 | /* |
504 | * The FX2 chip does not give us a zero length read at end of frame. | 504 | * The FX2 chip does not give us a zero length read at end of frame. |
505 | * It does, however, give a short read at the end of a frame, if | 505 | * It does, however, give a short read at the end of a frame, if |
506 | * neccessary, rather than run two frames together. | 506 | * necessary, rather than run two frames together. |
507 | * | 507 | * |
508 | * By choosing the right bulk transfer size, we are guaranteed to always | 508 | * By choosing the right bulk transfer size, we are guaranteed to always |
509 | * get a short read for the last read of each frame. Frame sizes are | 509 | * get a short read for the last read of each frame. Frame sizes are |
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt index f9f3584281d8..d38dd791511e 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/video/pwc/philips.txt | |||
@@ -33,7 +33,7 @@ a lot of extra information, a FAQ, and the binary plugin 'PWCX'. This plugin | |||
33 | contains decompression routines that allow you to use higher image sizes and | 33 | contains decompression routines that allow you to use higher image sizes and |
34 | framerates; in addition the webcam uses less bandwidth on the USB bus (handy | 34 | framerates; in addition the webcam uses less bandwidth on the USB bus (handy |
35 | if you want to run more than 1 camera simultaneously). These routines fall | 35 | if you want to run more than 1 camera simultaneously). These routines fall |
36 | under a NDA, and may therefor not be distributed as source; however, its use | 36 | under a NDA, and may therefore not be distributed as source; however, its use |
37 | is completely optional. | 37 | is completely optional. |
38 | 38 | ||
39 | You can build this code either into your kernel, or as a module. I recommend | 39 | You can build this code either into your kernel, or as a module. I recommend |
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h index 4af7382da5c5..494957b10bac 100644 --- a/drivers/media/video/sn9c102/sn9c102_sensor.h +++ b/drivers/media/video/sn9c102/sn9c102_sensor.h | |||
@@ -120,7 +120,7 @@ extern int sn9c102_write_regs(struct sn9c102_device*, const u8 valreg[][2], | |||
120 | /* | 120 | /* |
121 | Write multiple registers with constant values. For example: | 121 | Write multiple registers with constant values. For example: |
122 | sn9c102_write_const_regs(cam, {0x00, 0x14}, {0x60, 0x17}, {0x0f, 0x18}); | 122 | sn9c102_write_const_regs(cam, {0x00, 0x14}, {0x60, 0x17}, {0x0f, 0x18}); |
123 | Register adresses must be < 256. | 123 | Register addresses must be < 256. |
124 | */ | 124 | */ |
125 | #define sn9c102_write_const_regs(sn9c102_device, data...) \ | 125 | #define sn9c102_write_const_regs(sn9c102_device, data...) \ |
126 | ({ static const u8 _valreg[][2] = {data}; \ | 126 | ({ static const u8 _valreg[][2] = {data}; \ |
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index 0446524d3543..6bf6bc7dbc7f 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | The tea6420 is a bus controlled audio-matrix with 5 stereo inputs, | 7 | The tea6420 is a bus controlled audio-matrix with 5 stereo inputs, |
8 | 4 stereo outputs and gain control for each output. | 8 | 4 stereo outputs and gain control for each output. |
9 | It is cascadable, i.e. it can be found at the adresses 0x98 | 9 | It is cascadable, i.e. it can be found at the addresses 0x98 |
10 | and 0x9a on the i2c-bus. | 10 | and 0x9a on the i2c-bus. |
11 | 11 | ||
12 | For detailed informations download the specifications directly | 12 | For detailed informations download the specifications directly |
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 0cc5eeff5ee8..10491e4e305d 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -523,7 +523,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
523 | unsigned long clock = readl(sm->regs + SM501_CURRENT_CLOCK); | 523 | unsigned long clock = readl(sm->regs + SM501_CURRENT_CLOCK); |
524 | unsigned char reg; | 524 | unsigned char reg; |
525 | unsigned int pll_reg = 0; | 525 | unsigned int pll_reg = 0; |
526 | unsigned long sm501_freq; /* the actual frequency acheived */ | 526 | unsigned long sm501_freq; /* the actual frequency achieved */ |
527 | 527 | ||
528 | struct sm501_clock to; | 528 | struct sm501_clock to; |
529 | 529 | ||
@@ -533,7 +533,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
533 | 533 | ||
534 | switch (clksrc) { | 534 | switch (clksrc) { |
535 | case SM501_CLOCK_P2XCLK: | 535 | case SM501_CLOCK_P2XCLK: |
536 | /* This clock is divided in half so to achive the | 536 | /* This clock is divided in half so to achieve the |
537 | * requested frequency the value must be multiplied by | 537 | * requested frequency the value must be multiplied by |
538 | * 2. This clock also has an additional pre divisor */ | 538 | * 2. This clock also has an additional pre divisor */ |
539 | 539 | ||
@@ -562,7 +562,7 @@ unsigned long sm501_set_clock(struct device *dev, | |||
562 | break; | 562 | break; |
563 | 563 | ||
564 | case SM501_CLOCK_V2XCLK: | 564 | case SM501_CLOCK_V2XCLK: |
565 | /* This clock is divided in half so to achive the | 565 | /* This clock is divided in half so to achieve the |
566 | * requested frequency the value must be multiplied by 2. */ | 566 | * requested frequency the value must be multiplied by 2. */ |
567 | 567 | ||
568 | sm501_freq = (sm501_select_clock(2 * req_freq, &to, 3) / 2); | 568 | sm501_freq = (sm501_select_clock(2 * req_freq, &to, 3) / 2); |
@@ -648,7 +648,7 @@ unsigned long sm501_find_clock(struct device *dev, | |||
648 | unsigned long req_freq) | 648 | unsigned long req_freq) |
649 | { | 649 | { |
650 | struct sm501_devdata *sm = dev_get_drvdata(dev); | 650 | struct sm501_devdata *sm = dev_get_drvdata(dev); |
651 | unsigned long sm501_freq; /* the frequency achiveable by the 501 */ | 651 | unsigned long sm501_freq; /* the frequency achieveable by the 501 */ |
652 | struct sm501_clock to; | 652 | struct sm501_clock to; |
653 | 653 | ||
654 | switch (clksrc) { | 654 | switch (clksrc) { |
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 60a2b69e54f5..16cc91c827c9 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * This is a driver for the SDHC controller found in Freescale MX2/MX3 | 4 | * This is a driver for the SDHC controller found in Freescale MX2/MX3 |
5 | * SoCs. It is basically the same hardware as found on MX1 (imxmmc.c). | 5 | * SoCs. It is basically the same hardware as found on MX1 (imxmmc.c). |
6 | * Unlike the hardware found on MX1, this hardware just works and does | 6 | * Unlike the hardware found on MX1, this hardware just works and does |
7 | * not need all the quirks found in imxmmc.c, hence the seperate driver. | 7 | * not need all the quirks found in imxmmc.c, hence the separate driver. |
8 | * | 8 | * |
9 | * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> | 9 | * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> |
10 | * Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com> | 10 | * Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com> |
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c index 1bec5e1ce6ac..8db1148dfa47 100644 --- a/drivers/mtd/chips/jedec_probe.c +++ b/drivers/mtd/chips/jedec_probe.c | |||
@@ -226,7 +226,7 @@ struct unlock_addr { | |||
226 | * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, | 226 | * exists, but is for MTD_UADDR_NOT_SUPPORTED - and, therefore, |
227 | * should not be used. The problem is that structures with | 227 | * should not be used. The problem is that structures with |
228 | * initializers have extra fields initialized to 0. It is _very_ | 228 | * initializers have extra fields initialized to 0. It is _very_ |
229 | * desireable to have the unlock address entries for unsupported | 229 | * desirable to have the unlock address entries for unsupported |
230 | * data widths automatically initialized - that means that | 230 | * data widths automatically initialized - that means that |
231 | * MTD_UADDR_NOT_SUPPORTED must be 0 and the first entry here | 231 | * MTD_UADDR_NOT_SUPPORTED must be 0 and the first entry here |
232 | * must go unused. | 232 | * must go unused. |
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c index 087bcd745bb7..7d1cca7a31a9 100644 --- a/drivers/mtd/nand/bcm_umi_nand.c +++ b/drivers/mtd/nand/bcm_umi_nand.c | |||
@@ -381,7 +381,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev) | |||
381 | if (!r) | 381 | if (!r) |
382 | return -ENXIO; | 382 | return -ENXIO; |
383 | 383 | ||
384 | /* map physical adress */ | 384 | /* map physical address */ |
385 | bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1); | 385 | bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1); |
386 | 386 | ||
387 | if (!bcm_umi_io_base) { | 387 | if (!bcm_umi_io_base) { |
@@ -525,7 +525,7 @@ static int bcm_umi_nand_remove(struct platform_device *pdev) | |||
525 | /* Release resources, unregister device */ | 525 | /* Release resources, unregister device */ |
526 | nand_release(board_mtd); | 526 | nand_release(board_mtd); |
527 | 527 | ||
528 | /* unmap physical adress */ | 528 | /* unmap physical address */ |
529 | iounmap(bcm_umi_io_base); | 529 | iounmap(bcm_umi_io_base); |
530 | 530 | ||
531 | /* Free the MTD device structure */ | 531 | /* Free the MTD device structure */ |
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 45dec5770da0..b2900d8406d3 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -507,7 +507,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) | |||
507 | * MXC NANDFC can only perform full page+spare or | 507 | * MXC NANDFC can only perform full page+spare or |
508 | * spare-only read/write. When the upper layers | 508 | * spare-only read/write. When the upper layers |
509 | * layers perform a read/write buf operation, | 509 | * layers perform a read/write buf operation, |
510 | * we will used the saved column adress to index into | 510 | * we will used the saved column address to index into |
511 | * the full page. | 511 | * the full page. |
512 | */ | 512 | */ |
513 | send_addr(host, 0, page_addr == -1); | 513 | send_addr(host, 0, page_addr == -1); |
diff --git a/drivers/net/atlx/atl2.h b/drivers/net/atlx/atl2.h index d918bbe621ea..927e4de6474d 100644 --- a/drivers/net/atlx/atl2.h +++ b/drivers/net/atlx/atl2.h | |||
@@ -442,7 +442,7 @@ struct atl2_hw { | |||
442 | struct atl2_ring_header { | 442 | struct atl2_ring_header { |
443 | /* pointer to the descriptor ring memory */ | 443 | /* pointer to the descriptor ring memory */ |
444 | void *desc; | 444 | void *desc; |
445 | /* physical adress of the descriptor ring */ | 445 | /* physical address of the descriptor ring */ |
446 | dma_addr_t dma; | 446 | dma_addr_t dma; |
447 | /* length of descriptor ring in bytes */ | 447 | /* length of descriptor ring in bytes */ |
448 | unsigned int size; | 448 | unsigned int size; |
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index 109d2783e4d8..bef02330464d 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
@@ -248,7 +248,7 @@ static void restart_sched(unsigned long); | |||
248 | * | 248 | * |
249 | * Interrupts are handled by a single CPU and it is likely that on a MP system | 249 | * Interrupts are handled by a single CPU and it is likely that on a MP system |
250 | * the application is migrated to another CPU. In that scenario, we try to | 250 | * the application is migrated to another CPU. In that scenario, we try to |
251 | * seperate the RX(in irq context) and TX state in order to decrease memory | 251 | * separate the RX(in irq context) and TX state in order to decrease memory |
252 | * contention. | 252 | * contention. |
253 | */ | 253 | */ |
254 | struct sge { | 254 | struct sge { |
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index 02d67d047d96..dc4eb87309c5 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
@@ -1363,7 +1363,7 @@ static s32 e1000_setup_fiber_serdes_link_82571(struct e1000_hw *hw) | |||
1363 | * | 1363 | * |
1364 | * 1) down | 1364 | * 1) down |
1365 | * 2) autoneg_progress | 1365 | * 2) autoneg_progress |
1366 | * 3) autoneg_complete (the link sucessfully autonegotiated) | 1366 | * 3) autoneg_complete (the link successfully autonegotiated) |
1367 | * 4) forced_up (the link has been forced up, it did not autonegotiate) | 1367 | * 4) forced_up (the link has been forced up, it did not autonegotiate) |
1368 | * | 1368 | * |
1369 | **/ | 1369 | **/ |
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 2fa9b36a2c5a..3af0b1b82832 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
@@ -587,7 +587,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) | |||
587 | if (!(rxcw & E1000_RXCW_IV)) { | 587 | if (!(rxcw & E1000_RXCW_IV)) { |
588 | mac->serdes_has_link = true; | 588 | mac->serdes_has_link = true; |
589 | e_dbg("SERDES: Link up - autoneg " | 589 | e_dbg("SERDES: Link up - autoneg " |
590 | "completed sucessfully.\n"); | 590 | "completed successfully.\n"); |
591 | } else { | 591 | } else { |
592 | mac->serdes_has_link = false; | 592 | mac->serdes_has_link = false; |
593 | e_dbg("SERDES: Link down - invalid" | 593 | e_dbg("SERDES: Link down - invalid" |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 997124d2992a..e2ce8f8a21a7 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -674,7 +674,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter) | |||
674 | /* start with one vector for every rx queue */ | 674 | /* start with one vector for every rx queue */ |
675 | numvecs = adapter->num_rx_queues; | 675 | numvecs = adapter->num_rx_queues; |
676 | 676 | ||
677 | /* if tx handler is seperate add 1 for every tx queue */ | 677 | /* if tx handler is separate add 1 for every tx queue */ |
678 | if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS)) | 678 | if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS)) |
679 | numvecs += adapter->num_tx_queues; | 679 | numvecs += adapter->num_tx_queues; |
680 | 680 | ||
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index c412e8026173..1dcdce0631aa 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
@@ -331,7 +331,7 @@ static int sa1100_irda_resume(struct platform_device *pdev) | |||
331 | * If we missed a speed change, initialise at the new speed | 331 | * If we missed a speed change, initialise at the new speed |
332 | * directly. It is debatable whether this is actually | 332 | * directly. It is debatable whether this is actually |
333 | * required, but in the interests of continuing from where | 333 | * required, but in the interests of continuing from where |
334 | * we left off it is desireable. The converse argument is | 334 | * we left off it is desirable. The converse argument is |
335 | * that we should re-negotiate at 9600 baud again. | 335 | * that we should re-negotiate at 9600 baud again. |
336 | */ | 336 | */ |
337 | if (si->newspeed) { | 337 | if (si->newspeed) { |
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c index 058fa0a48c6f..b8d21ab212c6 100644 --- a/drivers/net/qlge/qlge_ethtool.c +++ b/drivers/net/qlge/qlge_ethtool.c | |||
@@ -402,7 +402,7 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) | |||
402 | u32 wol = 0; | 402 | u32 wol = 0; |
403 | status = ql_mb_wol_mode(qdev, wol); | 403 | status = ql_mb_wol_mode(qdev, wol); |
404 | QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n", | 404 | QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n", |
405 | (status == 0) ? "cleared sucessfully" : "clear failed", | 405 | (status == 0) ? "cleared successfully" : "clear failed", |
406 | wol, qdev->ndev->name); | 406 | wol, qdev->ndev->name); |
407 | } | 407 | } |
408 | 408 | ||
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 894a7c84faef..a35845b48ea4 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -3517,7 +3517,7 @@ int ql_wol(struct ql_adapter *qdev) | |||
3517 | wol |= MB_WOL_MODE_ON; | 3517 | wol |= MB_WOL_MODE_ON; |
3518 | status = ql_mb_wol_mode(qdev, wol); | 3518 | status = ql_mb_wol_mode(qdev, wol); |
3519 | QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n", | 3519 | QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n", |
3520 | (status == 0) ? "Sucessfully set" : "Failed", wol, | 3520 | (status == 0) ? "Successfully set" : "Failed", wol, |
3521 | qdev->ndev->name); | 3521 | qdev->ndev->name); |
3522 | } | 3522 | } |
3523 | 3523 | ||
diff --git a/drivers/net/sfc/regs.h b/drivers/net/sfc/regs.h index 89d606fe9248..18a3be428348 100644 --- a/drivers/net/sfc/regs.h +++ b/drivers/net/sfc/regs.h | |||
@@ -95,7 +95,7 @@ | |||
95 | #define FRF_AA_INT_ACK_KER_FIELD_LBN 0 | 95 | #define FRF_AA_INT_ACK_KER_FIELD_LBN 0 |
96 | #define FRF_AA_INT_ACK_KER_FIELD_WIDTH 32 | 96 | #define FRF_AA_INT_ACK_KER_FIELD_WIDTH 32 |
97 | 97 | ||
98 | /* INT_ISR0_REG: Function 0 Interrupt Acknowlege Status register */ | 98 | /* INT_ISR0_REG: Function 0 Interrupt Acknowledge Status register */ |
99 | #define FR_BZ_INT_ISR0 0x00000090 | 99 | #define FR_BZ_INT_ISR0 0x00000090 |
100 | #define FRF_BZ_INT_ISR_REG_LBN 0 | 100 | #define FRF_BZ_INT_ISR_REG_LBN 0 |
101 | #define FRF_BZ_INT_ISR_REG_WIDTH 64 | 101 | #define FRF_BZ_INT_ISR_REG_WIDTH 64 |
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index 12f0f5d74e3c..2ae1972bcb46 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c | |||
@@ -1348,7 +1348,7 @@ static int smsc9420_open(struct net_device *dev) | |||
1348 | 1348 | ||
1349 | netif_carrier_off(dev); | 1349 | netif_carrier_off(dev); |
1350 | 1350 | ||
1351 | /* disable, mask and acknowlege all interrupts */ | 1351 | /* disable, mask and acknowledge all interrupts */ |
1352 | spin_lock_irqsave(&pd->int_lock, flags); | 1352 | spin_lock_irqsave(&pd->int_lock, flags); |
1353 | int_cfg = smsc9420_reg_read(pd, INT_CFG) & (~INT_CFG_IRQ_EN_); | 1353 | int_cfg = smsc9420_reg_read(pd, INT_CFG) & (~INT_CFG_IRQ_EN_); |
1354 | smsc9420_reg_write(pd, INT_CFG, int_cfg); | 1354 | smsc9420_reg_write(pd, INT_CFG, int_cfg); |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 218524857bfc..839b1f065d3c 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -474,7 +474,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card, | |||
474 | * spider_net_enable_rxchtails - sets RX dmac chain tail addresses | 474 | * spider_net_enable_rxchtails - sets RX dmac chain tail addresses |
475 | * @card: card structure | 475 | * @card: card structure |
476 | * | 476 | * |
477 | * spider_net_enable_rxchtails sets the RX DMAC chain tail adresses in the | 477 | * spider_net_enable_rxchtails sets the RX DMAC chain tail addresses in the |
478 | * chip by writing to the appropriate register. DMA is enabled in | 478 | * chip by writing to the appropriate register. DMA is enabled in |
479 | * spider_net_enable_rxdmac. | 479 | * spider_net_enable_rxdmac. |
480 | */ | 480 | */ |
@@ -1820,7 +1820,7 @@ spider_net_enable_card(struct spider_net_card *card) | |||
1820 | 1820 | ||
1821 | spider_net_write_reg(card, SPIDER_NET_ECMODE, SPIDER_NET_ECMODE_VALUE); | 1821 | spider_net_write_reg(card, SPIDER_NET_ECMODE, SPIDER_NET_ECMODE_VALUE); |
1822 | 1822 | ||
1823 | /* set chain tail adress for RX chains and | 1823 | /* set chain tail address for RX chains and |
1824 | * enable DMA */ | 1824 | * enable DMA */ |
1825 | spider_net_enable_rxchtails(card); | 1825 | spider_net_enable_rxchtails(card); |
1826 | spider_net_enable_rxdmac(card); | 1826 | spider_net_enable_rxdmac(card); |
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index b571a1babab9..a88fcb39ba15 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -782,7 +782,7 @@ static int gem_rx(struct gem *gp, int work_to_do) | |||
782 | break; | 782 | break; |
783 | 783 | ||
784 | /* When writing back RX descriptor, GEM writes status | 784 | /* When writing back RX descriptor, GEM writes status |
785 | * then buffer address, possibly in seperate transactions. | 785 | * then buffer address, possibly in separate transactions. |
786 | * If we don't wait for the chip to write both, we could | 786 | * If we don't wait for the chip to write both, we could |
787 | * post a new buffer to this descriptor then have GEM spam | 787 | * post a new buffer to this descriptor then have GEM spam |
788 | * on the buffer address. We sync on the RX completion | 788 | * on the buffer address. We sync on the RX completion |
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 80b404f2b938..ed4e9c42935c 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -1857,7 +1857,7 @@ static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size) | |||
1857 | * @data - desc's data | 1857 | * @data - desc's data |
1858 | * @size - desc's size | 1858 | * @size - desc's size |
1859 | * | 1859 | * |
1860 | * NOTE: this func does check for available space and, if neccessary, waits for | 1860 | * NOTE: this func does check for available space and, if necessary, waits for |
1861 | * NIC to read existing data before writing new one. | 1861 | * NIC to read existing data before writing new one. |
1862 | */ | 1862 | */ |
1863 | static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size) | 1863 | static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size) |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index e3c42f5ac4a9..4e4c402319c9 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -693,7 +693,7 @@ static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb, | |||
693 | * NOTE: This function should be used whenever the status of any TPL must be | 693 | * NOTE: This function should be used whenever the status of any TPL must be |
694 | * modified by the driver, because the compiler may otherwise change the | 694 | * modified by the driver, because the compiler may otherwise change the |
695 | * order of instructions such that writing the TPL status may be executed at | 695 | * order of instructions such that writing the TPL status may be executed at |
696 | * an undesireable time. When this function is used, the status is always | 696 | * an undesirable time. When this function is used, the status is always |
697 | * written when the function is called. | 697 | * written when the function is called. |
698 | */ | 698 | */ |
699 | static void tms380tr_write_tpl_status(TPL *tpl, unsigned int Status) | 699 | static void tms380tr_write_tpl_status(TPL *tpl, unsigned int Status) |
@@ -2266,7 +2266,7 @@ static void tms380tr_rcv_status_irq(struct net_device *dev) | |||
2266 | * This function should be used whenever the status of any RPL must be | 2266 | * This function should be used whenever the status of any RPL must be |
2267 | * modified by the driver, because the compiler may otherwise change the | 2267 | * modified by the driver, because the compiler may otherwise change the |
2268 | * order of instructions such that writing the RPL status may be executed | 2268 | * order of instructions such that writing the RPL status may be executed |
2269 | * at an undesireable time. When this function is used, the status is | 2269 | * at an undesirable time. When this function is used, the status is |
2270 | * always written when the function is called. | 2270 | * always written when the function is called. |
2271 | */ | 2271 | */ |
2272 | static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status) | 2272 | static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status) |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 2834a01bae24..e572ecc09a44 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -1365,7 +1365,7 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
1365 | 1365 | ||
1366 | __tun_detach(tun); | 1366 | __tun_detach(tun); |
1367 | 1367 | ||
1368 | /* If desireable, unregister the netdevice. */ | 1368 | /* If desirable, unregister the netdevice. */ |
1369 | if (!(tun->flags & TUN_PERSIST)) { | 1369 | if (!(tun->flags & TUN_PERSIST)) { |
1370 | rtnl_lock(); | 1370 | rtnl_lock(); |
1371 | if (dev->reg_state == NETREG_REGISTERED) | 1371 | if (dev->reg_state == NETREG_REGISTERED) |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index eb8fe7e16c6c..8eec97799e05 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -429,7 +429,7 @@ static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth, | |||
429 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); | 429 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); |
430 | 430 | ||
431 | /* Ethernet frames are defined in Little Endian mode, | 431 | /* Ethernet frames are defined in Little Endian mode, |
432 | therefor to insert */ | 432 | therefore to insert */ |
433 | /* the address to the hash (Big Endian mode), we reverse the bytes.*/ | 433 | /* the address to the hash (Big Endian mode), we reverse the bytes.*/ |
434 | 434 | ||
435 | set_mac_addr(&p_82xx_addr_filt->taddr.h, p_enet_addr); | 435 | set_mac_addr(&p_82xx_addr_filt->taddr.h, p_enet_addr); |
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 64cdfeb299ca..6c459f5cb5df 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c | |||
@@ -612,7 +612,7 @@ ssize_t i2400m_bm_cmd(struct i2400m *i2400m, | |||
612 | goto error_wait_for_ack; | 612 | goto error_wait_for_ack; |
613 | } | 613 | } |
614 | rx_bytes = result; | 614 | rx_bytes = result; |
615 | /* verify the ack and read more if neccessary [result is the | 615 | /* verify the ack and read more if necessary [result is the |
616 | * final amount of bytes we get in the ack] */ | 616 | * final amount of bytes we get in the ack] */ |
617 | result = __i2400m_bm_ack_verify(i2400m, opcode, ack, ack_size, flags); | 617 | result = __i2400m_bm_ack_verify(i2400m, opcode, ack, ack_size, flags); |
618 | if (result < 0) | 618 | if (result < 0) |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 04df9bbe340f..820b128705ec 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -627,7 +627,7 @@ enum i2400m_bm_cmd_flags { | |||
627 | * @I2400M_BRI_NO_REBOOT: Do not reboot the device and proceed | 627 | * @I2400M_BRI_NO_REBOOT: Do not reboot the device and proceed |
628 | * directly to wait for a reboot barker from the device. | 628 | * directly to wait for a reboot barker from the device. |
629 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot | 629 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot |
630 | * rom after reading the MAC adress. This is quite a dirty hack, | 630 | * rom after reading the MAC address. This is quite a dirty hack, |
631 | * if you ask me -- the device requires the bootrom to be | 631 | * if you ask me -- the device requires the bootrom to be |
632 | * intialized after reading the MAC address. | 632 | * intialized after reading the MAC address. |
633 | */ | 633 | */ |
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c index 76a50ac02ebb..14f876b1358b 100644 --- a/drivers/net/wimax/i2400m/sdio.c +++ b/drivers/net/wimax/i2400m/sdio.c | |||
@@ -304,7 +304,7 @@ error_kzalloc: | |||
304 | * | 304 | * |
305 | * The device will be fully reset internally, but won't be | 305 | * The device will be fully reset internally, but won't be |
306 | * disconnected from the bus (so no reenumeration will | 306 | * disconnected from the bus (so no reenumeration will |
307 | * happen). Firmware upload will be neccessary. | 307 | * happen). Firmware upload will be necessary. |
308 | * | 308 | * |
309 | * The device will send a reboot barker that will trigger the driver | 309 | * The device will send a reboot barker that will trigger the driver |
310 | * to reinitialize the state via __i2400m_dev_reset_handle. | 310 | * to reinitialize the state via __i2400m_dev_reset_handle. |
@@ -314,7 +314,7 @@ error_kzalloc: | |||
314 | * | 314 | * |
315 | * The device will be fully reset internally, disconnected from the | 315 | * The device will be fully reset internally, disconnected from the |
316 | * bus an a reenumeration will happen. Firmware upload will be | 316 | * bus an a reenumeration will happen. Firmware upload will be |
317 | * neccessary. Thus, we don't do any locking or struct | 317 | * necessary. Thus, we don't do any locking or struct |
318 | * reinitialization, as we are going to be fully disconnected and | 318 | * reinitialization, as we are going to be fully disconnected and |
319 | * reenumerated. | 319 | * reenumerated. |
320 | * | 320 | * |
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 98f4f8c5fb68..99f04c475898 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c | |||
@@ -246,7 +246,7 @@ error_kzalloc: | |||
246 | * | 246 | * |
247 | * The device will be fully reset internally, but won't be | 247 | * The device will be fully reset internally, but won't be |
248 | * disconnected from the USB bus (so no reenumeration will | 248 | * disconnected from the USB bus (so no reenumeration will |
249 | * happen). Firmware upload will be neccessary. | 249 | * happen). Firmware upload will be necessary. |
250 | * | 250 | * |
251 | * The device will send a reboot barker in the notification endpoint | 251 | * The device will send a reboot barker in the notification endpoint |
252 | * that will trigger the driver to reinitialize the state | 252 | * that will trigger the driver to reinitialize the state |
@@ -257,7 +257,7 @@ error_kzalloc: | |||
257 | * | 257 | * |
258 | * The device will be fully reset internally, disconnected from the | 258 | * The device will be fully reset internally, disconnected from the |
259 | * USB bus an a reenumeration will happen. Firmware upload will be | 259 | * USB bus an a reenumeration will happen. Firmware upload will be |
260 | * neccessary. Thus, we don't do any locking or struct | 260 | * necessary. Thus, we don't do any locking or struct |
261 | * reinitialization, as we are going to be fully disconnected and | 261 | * reinitialization, as we are going to be fully disconnected and |
262 | * reenumerated. | 262 | * reenumerated. |
263 | * | 263 | * |
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index f9d6db8d013e..46a1e19c6787 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c | |||
@@ -2535,7 +2535,7 @@ void *ar9170_alloc(size_t priv_size) | |||
2535 | /* | 2535 | /* |
2536 | * this buffer is used for rx stream reconstruction. | 2536 | * this buffer is used for rx stream reconstruction. |
2537 | * Under heavy load this device (or the transport layer?) | 2537 | * Under heavy load this device (or the transport layer?) |
2538 | * tends to split the streams into seperate rx descriptors. | 2538 | * tends to split the streams into separate rx descriptors. |
2539 | */ | 2539 | */ |
2540 | 2540 | ||
2541 | skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL); | 2541 | skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL); |
diff --git a/drivers/net/wireless/iwmc3200wifi/lmac.h b/drivers/net/wireless/iwmc3200wifi/lmac.h index a3a79b5e2898..a855a99e49b8 100644 --- a/drivers/net/wireless/iwmc3200wifi/lmac.h +++ b/drivers/net/wireless/iwmc3200wifi/lmac.h | |||
@@ -262,7 +262,7 @@ struct iwm_ct_kill_cfg_cmd { | |||
262 | 262 | ||
263 | /* Power Management */ | 263 | /* Power Management */ |
264 | #define POWER_TABLE_CMD 0x77 | 264 | #define POWER_TABLE_CMD 0x77 |
265 | #define SAVE_RESTORE_ADRESS_CMD 0x78 | 265 | #define SAVE_RESTORE_ADDRESS_CMD 0x78 |
266 | #define REPLY_WATERMARK_CMD 0x79 | 266 | #define REPLY_WATERMARK_CMD 0x79 |
267 | #define PM_DEBUG_STATISTIC_NOTIFIC 0x7B | 267 | #define PM_DEBUG_STATISTIC_NOTIFIC 0x7B |
268 | #define PD_FLUSH_N_NOTIFICATION 0x7C | 268 | #define PD_FLUSH_N_NOTIFICATION 0x7C |
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 83f2592c59de..486c93559c29 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
@@ -368,7 +368,7 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev, | |||
368 | 368 | ||
369 | /* | 369 | /* |
370 | * The encryption key doesn't fit within the CSR cache, | 370 | * The encryption key doesn't fit within the CSR cache, |
371 | * this means we should allocate it seperately and use | 371 | * this means we should allocate it separately and use |
372 | * rt2x00usb_vendor_request() to send the key to the hardware. | 372 | * rt2x00usb_vendor_request() to send the key to the hardware. |
373 | */ | 373 | */ |
374 | reg = KEY_ENTRY(key->hw_key_idx); | 374 | reg = KEY_ENTRY(key->hw_key_idx); |
@@ -382,7 +382,7 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev, | |||
382 | /* | 382 | /* |
383 | * The driver does not support the IV/EIV generation | 383 | * The driver does not support the IV/EIV generation |
384 | * in hardware. However it demands the data to be provided | 384 | * in hardware. However it demands the data to be provided |
385 | * both seperately as well as inside the frame. | 385 | * both separately as well as inside the frame. |
386 | * We already provided the CONFIG_CRYPTO_COPY_IV to rt2x00lib | 386 | * We already provided the CONFIG_CRYPTO_COPY_IV to rt2x00lib |
387 | * to ensure rt2x00lib will not strip the data from the | 387 | * to ensure rt2x00lib will not strip the data from the |
388 | * frame after the copy, now we must tell mac80211 | 388 | * frame after the copy, now we must tell mac80211 |
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index ab95346cf6a3..2e5c8a13758b 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
@@ -100,7 +100,7 @@ static int rt2800usb_check_firmware(struct rt2x00_dev *rt2x00dev, | |||
100 | * There are 2 variations of the rt2870 firmware. | 100 | * There are 2 variations of the rt2870 firmware. |
101 | * a) size: 4kb | 101 | * a) size: 4kb |
102 | * b) size: 8kb | 102 | * b) size: 8kb |
103 | * Note that (b) contains 2 seperate firmware blobs of 4k | 103 | * Note that (b) contains 2 separate firmware blobs of 4k |
104 | * within the file. The first blob is the same firmware as (a), | 104 | * within the file. The first blob is the same firmware as (a), |
105 | * but the second blob is for the additional chipsets. | 105 | * but the second blob is for the additional chipsets. |
106 | */ | 106 | */ |
@@ -118,7 +118,7 @@ static int rt2800usb_check_firmware(struct rt2x00_dev *rt2x00dev, | |||
118 | 118 | ||
119 | /* | 119 | /* |
120 | * 8kb firmware files must be checked as if it were | 120 | * 8kb firmware files must be checked as if it were |
121 | * 2 seperate firmware files. | 121 | * 2 separate firmware files. |
122 | */ | 122 | */ |
123 | while (offset < len) { | 123 | while (offset < len) { |
124 | if (!rt2800usb_check_crc(data + offset, 4096)) | 124 | if (!rt2800usb_check_crc(data + offset, 4096)) |
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index 7d323a763b54..afee806affc2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c | |||
@@ -109,7 +109,7 @@ struct rt2x00debug_intf { | |||
109 | 109 | ||
110 | /* | 110 | /* |
111 | * HW crypto statistics. | 111 | * HW crypto statistics. |
112 | * All statistics are stored seperately per cipher type. | 112 | * All statistics are stored separately per cipher type. |
113 | */ | 113 | */ |
114 | struct rt2x00debug_crypto crypto_stats[CIPHER_MAX]; | 114 | struct rt2x00debug_crypto crypto_stats[CIPHER_MAX]; |
115 | 115 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 265e66dba552..5e1d5167fff4 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -397,7 +397,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev, | |||
397 | /* | 397 | /* |
398 | * Hardware might have stripped the IV/EIV/ICV data, | 398 | * Hardware might have stripped the IV/EIV/ICV data, |
399 | * in that case it is possible that the data was | 399 | * in that case it is possible that the data was |
400 | * provided seperately (through hardware descriptor) | 400 | * provided separately (through hardware descriptor) |
401 | * in which case we should reinsert the data into the frame. | 401 | * in which case we should reinsert the data into the frame. |
402 | */ | 402 | */ |
403 | if ((rxdesc.dev_flags & RXDONE_CRYPTO_IV) && | 403 | if ((rxdesc.dev_flags & RXDONE_CRYPTO_IV) && |
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 9915a09141ef..38ffca9b0fe7 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -502,7 +502,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
502 | /* | 502 | /* |
503 | * When hardware encryption is supported, and this frame | 503 | * When hardware encryption is supported, and this frame |
504 | * is to be encrypted, we should strip the IV/EIV data from | 504 | * is to be encrypted, we should strip the IV/EIV data from |
505 | * the frame so we can provide it to the driver seperately. | 505 | * the frame so we can provide it to the driver separately. |
506 | */ | 506 | */ |
507 | if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc.flags) && | 507 | if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc.flags) && |
508 | !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc.flags)) { | 508 | !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc.flags)) { |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 0ca589306d71..99459db61efd 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -476,7 +476,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev, | |||
476 | * The driver does not support the IV/EIV generation | 476 | * The driver does not support the IV/EIV generation |
477 | * in hardware. However it doesn't support the IV/EIV | 477 | * in hardware. However it doesn't support the IV/EIV |
478 | * inside the ieee80211 frame either, but requires it | 478 | * inside the ieee80211 frame either, but requires it |
479 | * to be provided seperately for the descriptor. | 479 | * to be provided separately for the descriptor. |
480 | * rt2x00lib will cut the IV/EIV data out of all frames | 480 | * rt2x00lib will cut the IV/EIV data out of all frames |
481 | * given to us by mac80211, but we must tell mac80211 | 481 | * given to us by mac80211, but we must tell mac80211 |
482 | * to generate the IV/EIV data. | 482 | * to generate the IV/EIV data. |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index ced3b6ab5e16..527368a45fd5 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -339,7 +339,7 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev, | |||
339 | * The driver does not support the IV/EIV generation | 339 | * The driver does not support the IV/EIV generation |
340 | * in hardware. However it doesn't support the IV/EIV | 340 | * in hardware. However it doesn't support the IV/EIV |
341 | * inside the ieee80211 frame either, but requires it | 341 | * inside the ieee80211 frame either, but requires it |
342 | * to be provided seperately for the descriptor. | 342 | * to be provided separately for the descriptor. |
343 | * rt2x00lib will cut the IV/EIV data out of all frames | 343 | * rt2x00lib will cut the IV/EIV data out of all frames |
344 | * given to us by mac80211, but we must tell mac80211 | 344 | * given to us by mac80211, but we must tell mac80211 |
345 | * to generate the IV/EIV data. | 345 | * to generate the IV/EIV data. |
@@ -439,7 +439,7 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev, | |||
439 | * The driver does not support the IV/EIV generation | 439 | * The driver does not support the IV/EIV generation |
440 | * in hardware. However it doesn't support the IV/EIV | 440 | * in hardware. However it doesn't support the IV/EIV |
441 | * inside the ieee80211 frame either, but requires it | 441 | * inside the ieee80211 frame either, but requires it |
442 | * to be provided seperately for the descriptor. | 442 | * to be provided separately for the descriptor. |
443 | * rt2x00lib will cut the IV/EIV data out of all frames | 443 | * rt2x00lib will cut the IV/EIV data out of all frames |
444 | * given to us by mac80211, but we must tell mac80211 | 444 | * given to us by mac80211, but we must tell mac80211 |
445 | * to generate the IV/EIV data. | 445 | * to generate the IV/EIV data. |
@@ -1665,7 +1665,7 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, | |||
1665 | 1665 | ||
1666 | /* | 1666 | /* |
1667 | * Hardware has stripped IV/EIV data from 802.11 frame during | 1667 | * Hardware has stripped IV/EIV data from 802.11 frame during |
1668 | * decryption. It has provided the data seperately but rt2x00lib | 1668 | * decryption. It has provided the data separately but rt2x00lib |
1669 | * should decide if it should be reinserted. | 1669 | * should decide if it should be reinserted. |
1670 | */ | 1670 | */ |
1671 | rxdesc->flags |= RX_FLAG_IV_STRIPPED; | 1671 | rxdesc->flags |= RX_FLAG_IV_STRIPPED; |
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 62ddf5202b79..2a4c566456e7 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c | |||
@@ -373,7 +373,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
373 | rq->rc = ccw_device_start(rp->cdev, &rq->ccw, | 373 | rq->rc = ccw_device_start(rp->cdev, &rq->ccw, |
374 | (unsigned long) rq, 0, 0); | 374 | (unsigned long) rq, 0, 0); |
375 | if (rq->rc == 0) | 375 | if (rq->rc == 0) |
376 | return; /* Sucessfully restarted. */ | 376 | return; /* Successfully restarted. */ |
377 | break; | 377 | break; |
378 | case RAW3270_IO_STOP: | 378 | case RAW3270_IO_STOP: |
379 | if (!rq) | 379 | if (!rq) |
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index ec88c59842e3..f6d72e1f2a38 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
@@ -196,7 +196,7 @@ __sclp_start_request(struct sclp_req *req) | |||
196 | req->start_count++; | 196 | req->start_count++; |
197 | 197 | ||
198 | if (rc == 0) { | 198 | if (rc == 0) { |
199 | /* Sucessfully started request */ | 199 | /* Successfully started request */ |
200 | req->status = SCLP_REQ_RUNNING; | 200 | req->status = SCLP_REQ_RUNNING; |
201 | sclp_running_state = sclp_running_state_running; | 201 | sclp_running_state = sclp_running_state_running; |
202 | __sclp_set_request_timer(SCLP_RETRY_INTERVAL * HZ, | 202 | __sclp_set_request_timer(SCLP_RETRY_INTERVAL * HZ, |
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index 208d6df9ed59..ff5716d5f044 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
@@ -492,7 +492,7 @@ static void init_alloc_map(struct orc_host * host) | |||
492 | * init_orchid - initialise the host adapter | 492 | * init_orchid - initialise the host adapter |
493 | * @host:host adapter to initialise | 493 | * @host:host adapter to initialise |
494 | * | 494 | * |
495 | * Initialise the controller and if neccessary load the firmware. | 495 | * Initialise the controller and if necessary load the firmware. |
496 | * | 496 | * |
497 | * Returns -1 if the initialisation fails. | 497 | * Returns -1 if the initialisation fails. |
498 | */ | 498 | */ |
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 89a59484be02..a7714160fbc3 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c | |||
@@ -531,7 +531,7 @@ static void initio_read_eeprom(unsigned long base) | |||
531 | * initio_stop_bm - stop bus master | 531 | * initio_stop_bm - stop bus master |
532 | * @host: InitIO we are stopping | 532 | * @host: InitIO we are stopping |
533 | * | 533 | * |
534 | * Stop any pending DMA operation, aborting the DMA if neccessary | 534 | * Stop any pending DMA operation, aborting the DMA if necessary |
535 | */ | 535 | */ |
536 | 536 | ||
537 | static void initio_stop_bm(struct initio_host * host) | 537 | static void initio_stop_bm(struct initio_host * host) |
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index 96ee599d9a05..96446a85e008 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
@@ -48,7 +48,7 @@ struct kmem_cache *scsi_pkt_cachep; | |||
48 | #define FC_SRB_CMD_SENT (1 << 0) /* cmd has been sent */ | 48 | #define FC_SRB_CMD_SENT (1 << 0) /* cmd has been sent */ |
49 | #define FC_SRB_RCV_STATUS (1 << 1) /* response has arrived */ | 49 | #define FC_SRB_RCV_STATUS (1 << 1) /* response has arrived */ |
50 | #define FC_SRB_ABORT_PENDING (1 << 2) /* cmd abort sent to device */ | 50 | #define FC_SRB_ABORT_PENDING (1 << 2) /* cmd abort sent to device */ |
51 | #define FC_SRB_ABORTED (1 << 3) /* abort acknowleged */ | 51 | #define FC_SRB_ABORTED (1 << 3) /* abort acknowledged */ |
52 | #define FC_SRB_DISCONTIG (1 << 4) /* non-sequential data recvd */ | 52 | #define FC_SRB_DISCONTIG (1 << 4) /* non-sequential data recvd */ |
53 | #define FC_SRB_COMPL (1 << 5) /* fc_io_compl has been run */ | 53 | #define FC_SRB_COMPL (1 << 5) /* fc_io_compl has been run */ |
54 | #define FC_SRB_FCP_PROCESSING_TMO (1 << 6) /* timer function processing */ | 54 | #define FC_SRB_FCP_PROCESSING_TMO (1 << 6) /* timer function processing */ |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 2cc39684ce97..c898f47f30ba 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -969,7 +969,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
969 | * function returns, it does not guarantee all the IOCBs are actually aborted. | 969 | * function returns, it does not guarantee all the IOCBs are actually aborted. |
970 | * | 970 | * |
971 | * Return code | 971 | * Return code |
972 | * 0 - Sucessfully issued abort iocb on all outstanding flogis (Always 0) | 972 | * 0 - Successfully issued abort iocb on all outstanding flogis (Always 0) |
973 | **/ | 973 | **/ |
974 | int | 974 | int |
975 | lpfc_els_abort_flogi(struct lpfc_hba *phba) | 975 | lpfc_els_abort_flogi(struct lpfc_hba *phba) |
@@ -3117,7 +3117,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
3117 | if (ndlp && NLP_CHK_NODE_ACT(ndlp) && | 3117 | if (ndlp && NLP_CHK_NODE_ACT(ndlp) && |
3118 | (*((uint32_t *) (pcmd)) == ELS_CMD_LS_RJT)) { | 3118 | (*((uint32_t *) (pcmd)) == ELS_CMD_LS_RJT)) { |
3119 | /* A LS_RJT associated with Default RPI cleanup has its own | 3119 | /* A LS_RJT associated with Default RPI cleanup has its own |
3120 | * seperate code path. | 3120 | * separate code path. |
3121 | */ | 3121 | */ |
3122 | if (!(ndlp->nlp_flag & NLP_RM_DFLT_RPI)) | 3122 | if (!(ndlp->nlp_flag & NLP_RM_DFLT_RPI)) |
3123 | ls_rjt = 1; | 3123 | ls_rjt = 1; |
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h index 7db28cd49446..8c61a4fe1db9 100644 --- a/drivers/scsi/pcmcia/nsp_cs.h +++ b/drivers/scsi/pcmcia/nsp_cs.h | |||
@@ -187,7 +187,7 @@ | |||
187 | #define S_IO BIT(1) /* Input/Output line from SCSI bus */ | 187 | #define S_IO BIT(1) /* Input/Output line from SCSI bus */ |
188 | #define S_CD BIT(2) /* Command/Data line from SCSI bus */ | 188 | #define S_CD BIT(2) /* Command/Data line from SCSI bus */ |
189 | #define S_BUSY BIT(3) /* Busy line from SCSI bus */ | 189 | #define S_BUSY BIT(3) /* Busy line from SCSI bus */ |
190 | #define S_ACK BIT(4) /* Acknowlege line from SCSI bus */ | 190 | #define S_ACK BIT(4) /* Acknowledge line from SCSI bus */ |
191 | #define S_REQUEST BIT(5) /* Request line from SCSI bus */ | 191 | #define S_REQUEST BIT(5) /* Request line from SCSI bus */ |
192 | #define S_SELECT BIT(6) /* */ | 192 | #define S_SELECT BIT(6) /* */ |
193 | #define S_ATN BIT(7) /* */ | 193 | #define S_ATN BIT(7) /* */ |
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 9b44c6f1b10e..7985ae45d688 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c | |||
@@ -2924,7 +2924,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) | |||
2924 | break; | 2924 | break; |
2925 | default: | 2925 | default: |
2926 | PM8001_MSG_DBG(pm8001_ha, | 2926 | PM8001_MSG_DBG(pm8001_ha, |
2927 | pm8001_printk("unkown device type(%x)\n", deviceType)); | 2927 | pm8001_printk("unknown device type(%x)\n", deviceType)); |
2928 | break; | 2928 | break; |
2929 | } | 2929 | } |
2930 | phy->phy_type |= PORT_TYPE_SAS; | 2930 | phy->phy_type |= PORT_TYPE_SAS; |
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 7f9c83a76390..3b2c98fba834 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c | |||
@@ -600,7 +600,7 @@ static void pm8001_free_dev(struct pm8001_device *pm8001_dev) | |||
600 | * by the command "OPC_INB_REG_DEV", after that the HBA will assign a | 600 | * by the command "OPC_INB_REG_DEV", after that the HBA will assign a |
601 | * device ID(according to device's sas address) and returned it to LLDD. From | 601 | * device ID(according to device's sas address) and returned it to LLDD. From |
602 | * now on, we communicate with HBA FW with the device ID which HBA assigned | 602 | * now on, we communicate with HBA FW with the device ID which HBA assigned |
603 | * rather than sas address. it is the neccessary step for our HBA but it is | 603 | * rather than sas address. it is the necessary step for our HBA but it is |
604 | * the optional for other HBA driver. | 604 | * the optional for other HBA driver. |
605 | */ | 605 | */ |
606 | static int pm8001_dev_found_notify(struct domain_device *dev) | 606 | static int pm8001_dev_found_notify(struct domain_device *dev) |
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 92f89d50850c..b8ad07c3449e 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
@@ -938,7 +938,7 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = { | |||
938 | 938 | ||
939 | /* | 939 | /* |
940 | * pmcraid_ioctl_header - definition of header structure that preceeds all the | 940 | * pmcraid_ioctl_header - definition of header structure that preceeds all the |
941 | * buffers given as ioctl arguements. | 941 | * buffers given as ioctl arguments. |
942 | * | 942 | * |
943 | * .signature : always ASCII string, "PMCRAID" | 943 | * .signature : always ASCII string, "PMCRAID" |
944 | * .reserved : not used | 944 | * .reserved : not used |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 255da53e5a01..5d94772d449d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -2105,7 +2105,7 @@ static int sd_revalidate_disk(struct gendisk *disk) | |||
2105 | * which is followed by sdaaa. | 2105 | * which is followed by sdaaa. |
2106 | * | 2106 | * |
2107 | * This is basically 26 base counting with one extra 'nil' entry | 2107 | * This is basically 26 base counting with one extra 'nil' entry |
2108 | * at the beggining from the second digit on and can be | 2108 | * at the beginning from the second digit on and can be |
2109 | * determined using similar method as 26 base conversion with the | 2109 | * determined using similar method as 26 base conversion with the |
2110 | * index shifted -1 after each digit is computed. | 2110 | * index shifted -1 after each digit is computed. |
2111 | * | 2111 | * |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index c010733877ae..1fabede9e061 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -275,7 +275,7 @@ static inline u32 ack_bit(unsigned int irq) | |||
275 | * Claim the FIQ handler (only one can be active at any one time) and | 275 | * Claim the FIQ handler (only one can be active at any one time) and |
276 | * then setup the correct transfer code for this transfer. | 276 | * then setup the correct transfer code for this transfer. |
277 | * | 277 | * |
278 | * This call updates all the necessary state information if sucessful, | 278 | * This call updates all the necessary state information if successful, |
279 | * so the caller does not need to do anything more than start the transfer | 279 | * so the caller does not need to do anything more than start the transfer |
280 | * as normal, since the IRQ will have been re-routed to the FIQ handler. | 280 | * as normal, since the IRQ will have been re-routed to the FIQ handler. |
281 | */ | 281 | */ |
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h index 473a94ef905f..7c14d5c5a8ac 100644 --- a/drivers/usb/musb/musb_regs.h +++ b/drivers/usb/musb/musb_regs.h | |||
@@ -436,7 +436,7 @@ static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum, | |||
436 | #define MUSB_FLAT_OFFSET(_epnum, _offset) \ | 436 | #define MUSB_FLAT_OFFSET(_epnum, _offset) \ |
437 | (USB_OFFSET(USB_EP_NI0_TXMAXP) + (0x40 * (_epnum)) + (_offset)) | 437 | (USB_OFFSET(USB_EP_NI0_TXMAXP) + (0x40 * (_epnum)) + (_offset)) |
438 | 438 | ||
439 | /* Not implemented - HW has seperate Tx/Rx FIFO */ | 439 | /* Not implemented - HW has separate Tx/Rx FIFO */ |
440 | #define MUSB_TXCSR_MODE 0x0000 | 440 | #define MUSB_TXCSR_MODE 0x0000 |
441 | 441 | ||
442 | static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size) | 442 | static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size) |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index a591ebec0f89..52a81a312b86 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -154,7 +154,7 @@ struct cypress_private { | |||
154 | int isthrottled; /* if throttled, discard reads */ | 154 | int isthrottled; /* if throttled, discard reads */ |
155 | wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */ | 155 | wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */ |
156 | char prev_status, diff_status; /* used for TIOCMIWAIT */ | 156 | char prev_status, diff_status; /* used for TIOCMIWAIT */ |
157 | /* we pass a pointer to this as the arguement sent to | 157 | /* we pass a pointer to this as the argument sent to |
158 | cypress_set_termios old_termios */ | 158 | cypress_set_termios old_termios */ |
159 | struct ktermios tmp_termios; /* stores the old termios settings */ | 159 | struct ktermios tmp_termios; /* stores the old termios settings */ |
160 | }; | 160 | }; |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index a33483910dc8..9557f963662e 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -389,7 +389,7 @@ static int omap_lcdc_enable_plane(int plane, int enable) | |||
389 | /* | 389 | /* |
390 | * Configure the LCD DMA for a palette load operation and do the palette | 390 | * Configure the LCD DMA for a palette load operation and do the palette |
391 | * downloading synchronously. We don't use the frame+palette load mode of | 391 | * downloading synchronously. We don't use the frame+palette load mode of |
392 | * the controller, since the palette can always be downloaded seperately. | 392 | * the controller, since the palette can always be downloaded separately. |
393 | */ | 393 | */ |
394 | static void load_palette(void) | 394 | static void load_palette(void) |
395 | { | 395 | { |
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 0deb0a8867b7..7b63429f1a7c 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
@@ -517,12 +517,12 @@ s1d13xxxfb_bitblt_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
517 | src = (sy * stride) + (bpp * sx); | 517 | src = (sy * stride) + (bpp * sx); |
518 | } | 518 | } |
519 | 519 | ||
520 | /* set source adress */ | 520 | /* set source address */ |
521 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START0, (src & 0xff)); | 521 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START0, (src & 0xff)); |
522 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START1, (src >> 8) & 0x00ff); | 522 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START1, (src >> 8) & 0x00ff); |
523 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START2, (src >> 16) & 0x00ff); | 523 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START2, (src >> 16) & 0x00ff); |
524 | 524 | ||
525 | /* set destination adress */ | 525 | /* set destination address */ |
526 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START0, (dst & 0xff)); | 526 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START0, (dst & 0xff)); |
527 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START1, (dst >> 8) & 0x00ff); | 527 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START1, (dst >> 8) & 0x00ff); |
528 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START2, (dst >> 16) & 0x00ff); | 528 | s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START2, (dst >> 16) & 0x00ff); |
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 35370d0ecf03..b7dc1800efa9 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c | |||
@@ -411,7 +411,7 @@ static int sm501fb_set_par_common(struct fb_info *info, | |||
411 | struct sm501fb_par *par = info->par; | 411 | struct sm501fb_par *par = info->par; |
412 | struct sm501fb_info *fbi = par->info; | 412 | struct sm501fb_info *fbi = par->info; |
413 | unsigned long pixclock; /* pixelclock in Hz */ | 413 | unsigned long pixclock; /* pixelclock in Hz */ |
414 | unsigned long sm501pixclock; /* pixelclock the 501 can achive in Hz */ | 414 | unsigned long sm501pixclock; /* pixelclock the 501 can achieve in Hz */ |
415 | unsigned int mem_type; | 415 | unsigned int mem_type; |
416 | unsigned int clock_type; | 416 | unsigned int clock_type; |
417 | unsigned int head_addr; | 417 | unsigned int head_addr; |