diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-01-09 18:10:13 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-01-09 18:10:13 -0500 |
commit | 943ffb587cfdf3b2adfe52a6db08573f4ecf3284 (patch) | |
tree | d2b631e24a824e9742f941cf3b89b0eea91bd201 /drivers | |
parent | 540695886075964c0e5295bea8e4793e8765d010 (diff) |
spelling: s/retreive/retrieve/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 4 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_pm81.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/README.ioctl | 2 | ||||
-rw-r--r-- | drivers/net/hp100.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeon_monitor.c | 2 | ||||
-rw-r--r-- | drivers/video/logo/Makefile | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 8d0958c38b6b..4f50ee5767a2 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -630,12 +630,12 @@ static int read_eeprom(int cpu, struct mpu_data *out) | |||
630 | sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0); | 630 | sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0); |
631 | np = of_find_node_by_path(nodename); | 631 | np = of_find_node_by_path(nodename); |
632 | if (np == NULL) { | 632 | if (np == NULL) { |
633 | printk(KERN_ERR "therm_pm72: Failed to retreive cpuid node from device-tree\n"); | 633 | printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n"); |
634 | return -ENODEV; | 634 | return -ENODEV; |
635 | } | 635 | } |
636 | data = (u8 *)get_property(np, "cpuid", &len); | 636 | data = (u8 *)get_property(np, "cpuid", &len); |
637 | if (data == NULL) { | 637 | if (data == NULL) { |
638 | printk(KERN_ERR "therm_pm72: Failed to retreive cpuid property from device-tree\n"); | 638 | printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n"); |
639 | of_node_put(np); | 639 | of_node_put(np); |
640 | return -ENODEV; | 640 | return -ENODEV; |
641 | } | 641 | } |
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 80ddf9776bde..eb69a601e765 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * (typically the drive fan) | 26 | * (typically the drive fan) |
27 | * - the main control (first control) gets the target value scaled with | 27 | * - the main control (first control) gets the target value scaled with |
28 | * the first pair of factors, and is then modified as below | 28 | * the first pair of factors, and is then modified as below |
29 | * - the value of the target of the CPU Fan control loop is retreived, | 29 | * - the value of the target of the CPU Fan control loop is retrieved, |
30 | * scaled with the second pair of factors, and the max of that and | 30 | * scaled with the second pair of factors, and the max of that and |
31 | * the scaled target is applied to the main control. | 31 | * the scaled target is applied to the main control. |
32 | * | 32 | * |
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl index 73dd084c0e98..65c0c47aeb79 100644 --- a/drivers/message/i2o/README.ioctl +++ b/drivers/message/i2o/README.ioctl | |||
@@ -185,7 +185,7 @@ VII. Getting Parameters | |||
185 | ENOMEM Kernel memory allocation error | 185 | ENOMEM Kernel memory allocation error |
186 | 186 | ||
187 | A return value of 0 does not mean that the value was actually | 187 | A return value of 0 does not mean that the value was actually |
188 | properly retreived. The user should check the result list | 188 | properly retrieved. The user should check the result list |
189 | to determine the specific status of the transaction. | 189 | to determine the specific status of the transaction. |
190 | 190 | ||
191 | VIII. Downloading Software | 191 | VIII. Downloading Software |
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index e92c17f6931c..55c7ed608391 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct net_device *dev); | |||
276 | * Convert an address in a kernel buffer to a bus/phys/dma address. | 276 | * Convert an address in a kernel buffer to a bus/phys/dma address. |
277 | * This work *only* for memory fragments part of lp->page_vaddr, | 277 | * This work *only* for memory fragments part of lp->page_vaddr, |
278 | * because it was properly DMA allocated via pci_alloc_consistent(), | 278 | * because it was properly DMA allocated via pci_alloc_consistent(), |
279 | * so we just need to "retreive" the original mapping to bus/phys/dma | 279 | * so we just need to "retrieve" the original mapping to bus/phys/dma |
280 | * address - Jean II */ | 280 | * address - Jean II */ |
281 | static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) | 281 | static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) |
282 | { | 282 | { |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index af18355e94cc..4e9637eb6137 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -357,7 +357,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m | |||
357 | } while (retval != 5 && retval != ENODEV); | 357 | } while (retval != 5 && retval != ENODEV); |
358 | 358 | ||
359 | if (retval != 5) { | 359 | if (retval != 5) { |
360 | err("%s - failed to retreive serial line settings - %d", __FUNCTION__, retval); | 360 | err("%s - failed to retrieve serial line settings - %d", __FUNCTION__, retval); |
361 | return retval; | 361 | return retval; |
362 | } else { | 362 | } else { |
363 | spin_lock_irqsave(&priv->lock, flags); | 363 | spin_lock_irqsave(&priv->lock, flags); |
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index ea7c86306918..7f9838dceab5 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c | |||
@@ -423,7 +423,7 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, | |||
423 | /* | 423 | /* |
424 | * Probe display on both primary and secondary card's connector (if any) | 424 | * Probe display on both primary and secondary card's connector (if any) |
425 | * by various available techniques (i2c, OF device tree, BIOS, ...) and | 425 | * by various available techniques (i2c, OF device tree, BIOS, ...) and |
426 | * try to retreive EDID. The algorithm here comes from XFree's radeon | 426 | * try to retrieve EDID. The algorithm here comes from XFree's radeon |
427 | * driver | 427 | * driver |
428 | */ | 428 | */ |
429 | void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, | 429 | void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, |
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index d0244c04af5a..4ef5cd19609d 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile | |||
@@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o | |||
16 | 16 | ||
17 | # How to generate logo's | 17 | # How to generate logo's |
18 | 18 | ||
19 | # Use logo-cfiles to retreive list of .c files to be built | 19 | # Use logo-cfiles to retrieve list of .c files to be built |
20 | logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ | 20 | logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ |
21 | $(wildcard $(srctree)/$(src)/*$(1).$(2)))) | 21 | $(wildcard $(srctree)/$(src)/*$(1).$(2)))) |
22 | 22 | ||