aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-09 18:10:13 -0500
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>2006-01-09 18:10:13 -0500
commit943ffb587cfdf3b2adfe52a6db08573f4ecf3284 (patch)
treed2b631e24a824e9742f941cf3b89b0eea91bd201
parent540695886075964c0e5295bea8e4793e8765d010 (diff)
spelling: s/retreive/retrieve/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--Documentation/i2o/ioctl2
-rw-r--r--arch/powerpc/kernel/prom.c2
-rw-r--r--arch/powerpc/kernel/rtas.c2
-rw-r--r--arch/powerpc/kernel/setup_64.c2
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
-rw-r--r--arch/powerpc/platforms/powermac/cpufreq_64.c2
-rw-r--r--drivers/macintosh/therm_pm72.c4
-rw-r--r--drivers/macintosh/windfarm_pm81.c2
-rw-r--r--drivers/message/i2o/README.ioctl2
-rw-r--r--drivers/net/hp100.c2
-rw-r--r--drivers/usb/serial/cypress_m8.c2
-rw-r--r--drivers/video/aty/radeon_monitor.c2
-rw-r--r--drivers/video/logo/Makefile2
-rw-r--r--fs/9p/vfs_inode.c2
-rw-r--r--include/asm-powerpc/smu.h6
-rw-r--r--scripts/Makefile.modpost2
-rw-r--r--scripts/mksysmap2
17 files changed, 20 insertions, 20 deletions
diff --git a/Documentation/i2o/ioctl b/Documentation/i2o/ioctl
index 3e174978997d..1e77fac4e120 100644
--- a/Documentation/i2o/ioctl
+++ b/Documentation/i2o/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
191VIII. Downloading Software 191VIII. Downloading Software
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 977ee3adaf2d..34ab0daec3a7 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -972,7 +972,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
972#endif 972#endif
973 973
974#ifdef CONFIG_PPC_RTAS 974#ifdef CONFIG_PPC_RTAS
975 /* To help early debugging via the front panel, we retreive a minimal 975 /* To help early debugging via the front panel, we retrieve a minimal
976 * set of RTAS infos now if available 976 * set of RTAS infos now if available
977 */ 977 */
978 { 978 {
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 4283fa33f784..ae2e2a31a705 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -632,7 +632,7 @@ void rtas_stop_self(void)
632} 632}
633 633
634/* 634/*
635 * Call early during boot, before mem init or bootmem, to retreive the RTAS 635 * Call early during boot, before mem init or bootmem, to retrieve the RTAS
636 * informations from the device-tree and allocate the RMO buffer for userland 636 * informations from the device-tree and allocate the RMO buffer for userland
637 * accesses. 637 * accesses.
638 */ 638 */
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 98e9f0595dd8..81567e931260 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -438,7 +438,7 @@ void __init setup_system(void)
438 438
439 /* 439 /*
440 * Fill the ppc64_caches & systemcfg structures with informations 440 * Fill the ppc64_caches & systemcfg structures with informations
441 * retreived from the device-tree. Need to be called before 441 * retrieved from the device-tree. Need to be called before
442 * finish_device_tree() since the later requires some of the 442 * finish_device_tree() since the later requires some of the
443 * informations filled up here to properly parse the interrupt 443 * informations filled up here to properly parse the interrupt
444 * tree. 444 * tree.
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 5bb433cbe41b..149351a84b94 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -368,7 +368,7 @@ static unsigned long __init htab_get_table_size(void)
368 unsigned long mem_size, rnd_mem_size, pteg_count; 368 unsigned long mem_size, rnd_mem_size, pteg_count;
369 369
370 /* If hash size isn't already provided by the platform, we try to 370 /* If hash size isn't already provided by the platform, we try to
371 * retreive it from the device-tree. If it's not there neither, we 371 * retrieve it from the device-tree. If it's not there neither, we
372 * calculate it now based on the total RAM size 372 * calculate it now based on the total RAM size
373 */ 373 */
374 if (ppc64_pft_size == 0) 374 if (ppc64_pft_size == 0)
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index a4b50c4109c2..a415e8d2f7af 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -80,7 +80,7 @@ static struct freq_attr* g5_cpu_freqs_attr[] = {
80}; 80};
81 81
82/* Power mode data is an array of the 32 bits PCR values to use for 82/* Power mode data is an array of the 32 bits PCR values to use for
83 * the various frequencies, retreived from the device-tree 83 * the various frequencies, retrieved from the device-tree
84 */ 84 */
85static u32 *g5_pmode_data; 85static u32 *g5_pmode_data;
86static int g5_pmode_max; 86static int g5_pmode_max;
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
191VIII. Downloading Software 191VIII. 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 */
281static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) 281static 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 */
429void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 429void __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
20logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ 20logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
21 $(wildcard $(srctree)/$(src)/*$(1).$(2)))) 21 $(wildcard $(srctree)/$(src)/*$(1).$(2))))
22 22
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index d933ef1fbd8a..a17b28854288 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -663,7 +663,7 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
663} 663}
664 664
665/** 665/**
666 * v9fs_vfs_getattr - retreive file metadata 666 * v9fs_vfs_getattr - retrieve file metadata
667 * @mnt - mount information 667 * @mnt - mount information
668 * @dentry - file to get attributes on 668 * @dentry - file to get attributes on
669 * @stat - metadata structure to populate 669 * @stat - metadata structure to populate
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h
index 134c2b5be0f2..82ce47607774 100644
--- a/include/asm-powerpc/smu.h
+++ b/include/asm-powerpc/smu.h
@@ -22,7 +22,7 @@
22/* 22/*
23 * Partition info commands 23 * Partition info commands
24 * 24 *
25 * These commands are used to retreive the sdb-partition-XX datas from 25 * These commands are used to retrieve the sdb-partition-XX datas from
26 * the SMU. The lenght is always 2. First byte is the subcommand code 26 * the SMU. The lenght is always 2. First byte is the subcommand code
27 * and second byte is the partition ID. 27 * and second byte is the partition ID.
28 * 28 *
@@ -225,7 +225,7 @@
225 * 225 *
226 * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to 226 * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to
227 * transfer blocks of data from the SMU. So far, I've decrypted it's 227 * transfer blocks of data from the SMU. So far, I've decrypted it's
228 * usage to retreive partition data. In order to do that, you have to 228 * usage to retrieve partition data. In order to do that, you have to
229 * break your transfer in "chunks" since that command cannot transfer 229 * break your transfer in "chunks" since that command cannot transfer
230 * more than a chunk at a time. The chunk size used by OF is 0xe bytes, 230 * more than a chunk at a time. The chunk size used by OF is 0xe bytes,
231 * but it seems that the darwin driver will let you do 0x1e bytes if 231 * but it seems that the darwin driver will let you do 0x1e bytes if
@@ -556,7 +556,7 @@ struct smu_user_cmd_hdr
556 __u32 cmdtype; 556 __u32 cmdtype;
557#define SMU_CMDTYPE_SMU 0 /* SMU command */ 557#define SMU_CMDTYPE_SMU 0 /* SMU command */
558#define SMU_CMDTYPE_WANTS_EVENTS 1 /* switch fd to events mode */ 558#define SMU_CMDTYPE_WANTS_EVENTS 1 /* switch fd to events mode */
559#define SMU_CMDTYPE_GET_PARTITION 2 /* retreive an sdb partition */ 559#define SMU_CMDTYPE_GET_PARTITION 2 /* retrieve an sdb partition */
560 560
561 __u8 cmd; /* SMU command byte */ 561 __u8 cmd; /* SMU command byte */
562 __u8 pad[3]; /* padding */ 562 __u8 pad[3]; /* padding */
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 0c4f3a9f2ea9..bf96a61d4b86 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -30,7 +30,7 @@
30# - See include/linux/module.h for more details 30# - See include/linux/module.h for more details
31 31
32# Step 4 is solely used to allow module versioning in external modules, 32# Step 4 is solely used to allow module versioning in external modules,
33# where the CRC of each module is retreived from the Module.symers file. 33# where the CRC of each module is retrieved from the Module.symers file.
34 34
35.PHONY: _modpost 35.PHONY: _modpost
36_modpost: __modpost 36_modpost: __modpost
diff --git a/scripts/mksysmap b/scripts/mksysmap
index a6430e05972d..4390fab9f5bd 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -1,7 +1,7 @@
1#!/bin/sh -x 1#!/bin/sh -x
2# Based on the vmlinux file create the System.map file 2# Based on the vmlinux file create the System.map file
3# System.map is used by module-init tools and some debugging 3# System.map is used by module-init tools and some debugging
4# tools to retreive the actual addresses of symbols in the kernel. 4# tools to retrieve the actual addresses of symbols in the kernel.
5# 5#
6# Usage 6# Usage
7# mksysmap vmlinux System.map 7# mksysmap vmlinux System.map