aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/bast-map.h2
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/dma.h2
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/vr1000-map.h2
-rw-r--r--arch/arm/mach-s3c24xx/pm.c2
-rw-r--r--arch/arm/plat-s3c24xx/dma.c2
-rw-r--r--arch/m68k/math-emu/fp_log.c2
-rw-r--r--arch/powerpc/include/asm/pte-hash64-64k.h2
-rw-r--r--arch/powerpc/include/asm/smu.h4
-rw-r--r--arch/powerpc/kernel/legacy_serial.c2
-rw-r--r--arch/powerpc/kernel/of_platform.c2
-rw-r--r--arch/powerpc/kernel/signal_64.c2
-rw-r--r--arch/powerpc/mm/slice.c2
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_gpt.c2
-rw-r--r--arch/powerpc/platforms/cell/iommu.c2
-rw-r--r--arch/powerpc/platforms/cell/spider-pic.c6
-rw-r--r--arch/powerpc/platforms/powermac/pic.c2
16 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/bast-map.h b/arch/arm/mach-s3c24xx/include/mach/bast-map.h
index 6e7dc9d0cf0e..eecea2a50f8f 100644
--- a/arch/arm/mach-s3c24xx/include/mach/bast-map.h
+++ b/arch/arm/mach-s3c24xx/include/mach/bast-map.h
@@ -74,7 +74,7 @@
74 74
75 75
76/* 0xE0000000 contains the IO space that is split by speed and 76/* 0xE0000000 contains the IO space that is split by speed and
77 * wether the access is for 8 or 16bit IO... this ensures that 77 * whether the access is for 8 or 16bit IO... this ensures that
78 * the correct access is made 78 * the correct access is made
79 * 79 *
80 * 0x10000000 of space, partitioned as so: 80 * 0x10000000 of space, partitioned as so:
diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h
index ee99fd56c043..6b72d5a4b377 100644
--- a/arch/arm/mach-s3c24xx/include/mach/dma.h
+++ b/arch/arm/mach-s3c24xx/include/mach/dma.h
@@ -88,7 +88,7 @@ enum s3c2410_dma_state {
88 * 88 *
89 * This represents the state of the DMA engine, wrt to the loaded / running 89 * This represents the state of the DMA engine, wrt to the loaded / running
90 * transfers. Since we don't have any way of knowing exactly the state of 90 * transfers. Since we don't have any way of knowing exactly the state of
91 * the DMA transfers, we need to know the state to make decisions on wether 91 * the DMA transfers, we need to know the state to make decisions on whether
92 * we can 92 * we can
93 * 93 *
94 * S3C2410_DMA_NONE 94 * S3C2410_DMA_NONE
diff --git a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
index 99612fcc4eb2..28376e56dd3b 100644
--- a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
+++ b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
@@ -51,7 +51,7 @@
51#define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) 51#define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000)
52 52
53/* 0xE0000000 contains the IO space that is split by speed and 53/* 0xE0000000 contains the IO space that is split by speed and
54 * wether the access is for 8 or 16bit IO... this ensures that 54 * whether the access is for 8 or 16bit IO... this ensures that
55 * the correct access is made 55 * the correct access is made
56 * 56 *
57 * 0x10000000 of space, partitioned as so: 57 * 0x10000000 of space, partitioned as so:
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c
index 60627e63a254..724755f0b0f5 100644
--- a/arch/arm/mach-s3c24xx/pm.c
+++ b/arch/arm/mach-s3c24xx/pm.c
@@ -121,7 +121,7 @@ void s3c_pm_configure_extint(void)
121 int pin; 121 int pin;
122 122
123 /* for each of the external interrupts (EINT0..EINT15) we 123 /* for each of the external interrupts (EINT0..EINT15) we
124 * need to check wether it is an external interrupt source, 124 * need to check whether it is an external interrupt source,
125 * and then configure it as an input if it is not 125 * and then configure it as an input if it is not
126 */ 126 */
127 127
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index db98e7021f0d..3eb5139656af 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -325,7 +325,7 @@ static int s3c2410_dma_start(struct s3c2410_dma_chan *chan)
325 325
326 chan->state = S3C2410_DMA_RUNNING; 326 chan->state = S3C2410_DMA_RUNNING;
327 327
328 /* check wether there is anything to load, and if not, see 328 /* check whether there is anything to load, and if not, see
329 * if we can find anything to load 329 * if we can find anything to load
330 */ 330 */
331 331
diff --git a/arch/m68k/math-emu/fp_log.c b/arch/m68k/math-emu/fp_log.c
index 3384a5244fbd..0663067870f2 100644
--- a/arch/m68k/math-emu/fp_log.c
+++ b/arch/m68k/math-emu/fp_log.c
@@ -50,7 +50,7 @@ fp_fsqrt(struct fp_ext *dest, struct fp_ext *src)
50 * sqrt(m*2^e) = 50 * sqrt(m*2^e) =
51 * sqrt(2*m) * 2^(p) , if e = 2*p + 1 51 * sqrt(2*m) * 2^(p) , if e = 2*p + 1
52 * 52 *
53 * So we use the last bit of the exponent to decide wether to 53 * So we use the last bit of the exponent to decide whether to
54 * use the m or 2*m. 54 * use the m or 2*m.
55 * 55 *
56 * Since only the fractional part of the mantissa is stored and 56 * Since only the fractional part of the mantissa is stored and
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h
index eedf427c9124..3e13e23e4fdf 100644
--- a/arch/powerpc/include/asm/pte-hash64-64k.h
+++ b/arch/powerpc/include/asm/pte-hash64-64k.h
@@ -23,7 +23,7 @@
23 23
24/* Note the full page bits must be in the same location as for normal 24/* Note the full page bits must be in the same location as for normal
25 * 4k pages as the same assembly will be used to insert 64K pages 25 * 4k pages as the same assembly will be used to insert 64K pages
26 * wether the kernel has CONFIG_PPC_64K_PAGES or not 26 * whether the kernel has CONFIG_PPC_64K_PAGES or not
27 */ 27 */
28#define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ 28#define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */
29#define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ 29#define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */
diff --git a/arch/powerpc/include/asm/smu.h b/arch/powerpc/include/asm/smu.h
index ae20ce1af4c7..6e909f3e6a46 100644
--- a/arch/powerpc/include/asm/smu.h
+++ b/arch/powerpc/include/asm/smu.h
@@ -132,7 +132,7 @@
132 * 132 *
133 * At this point, the OF driver seems to have a limitation on transfer 133 * At this point, the OF driver seems to have a limitation on transfer
134 * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know 134 * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know
135 * wether this is just an OF limit due to some temporary buffer size 135 * whether this is just an OF limit due to some temporary buffer size
136 * or if this is an SMU imposed limit. This driver has the same limitation 136 * or if this is an SMU imposed limit. This driver has the same limitation
137 * for now as I use a 0x10 bytes temporary buffer as well 137 * for now as I use a 0x10 bytes temporary buffer as well
138 * 138 *
@@ -236,7 +236,7 @@
236 * 3 (optional): enable nmi? [0x00 or 0x01] 236 * 3 (optional): enable nmi? [0x00 or 0x01]
237 * 237 *
238 * Returns: 238 * Returns:
239 * If parameter 2 is 0x00 and parameter 3 is not specified, returns wether 239 * If parameter 2 is 0x00 and parameter 3 is not specified, returns whether
240 * NMI is enabled. Otherwise unknown. 240 * NMI is enabled. Otherwise unknown.
241 */ 241 */
242#define SMU_CMD_MISC_df_NMI_OPTION 0x04 242#define SMU_CMD_MISC_df_NMI_OPTION 0x04
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index bedd12e1cfbc..0733b05eb856 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -387,7 +387,7 @@ void __init find_legacy_serial_ports(void)
387 of_node_put(parent); 387 of_node_put(parent);
388 continue; 388 continue;
389 } 389 }
390 /* Check for known pciclass, and also check wether we have 390 /* Check for known pciclass, and also check whether we have
391 * a device with child nodes for ports or not 391 * a device with child nodes for ports or not
392 */ 392 */
393 if (of_device_is_compatible(np, "pciclass,0700") || 393 if (of_device_is_compatible(np, "pciclass,0700") ||
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 2049f2d00ffe..9db8ec07ec94 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -82,7 +82,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
82 return -ENXIO; 82 return -ENXIO;
83 83
84 /* Claim resources. This might need some rework as well depending 84 /* Claim resources. This might need some rework as well depending
85 * wether we are doing probe-only or not, like assigning unassigned 85 * whether we are doing probe-only or not, like assigning unassigned
86 * resources etc... 86 * resources etc...
87 */ 87 */
88 pcibios_claim_one_bus(phb->bus); 88 pcibios_claim_one_bus(phb->bus);
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index d183f8719a50..1ca045d44324 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -83,7 +83,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
83 * the context). This is very important because we must ensure we 83 * the context). This is very important because we must ensure we
84 * don't lose the VRSAVE content that may have been set prior to 84 * don't lose the VRSAVE content that may have been set prior to
85 * the process doing its first vector operation 85 * the process doing its first vector operation
86 * Userland shall check AT_HWCAP to know wether it can rely on the 86 * Userland shall check AT_HWCAP to know whether it can rely on the
87 * v_regs pointer or not 87 * v_regs pointer or not
88 */ 88 */
89#ifdef CONFIG_ALTIVEC 89#ifdef CONFIG_ALTIVEC
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 5829d2a950d4..cf9dada734b6 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -722,7 +722,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
722} 722}
723 723
724/* 724/*
725 * is_hugepage_only_range() is used by generic code to verify wether 725 * is_hugepage_only_range() is used by generic code to verify whether
726 * a normal mmap mapping (non hugetlbfs) is valid on a given area. 726 * a normal mmap mapping (non hugetlbfs) is valid on a given area.
727 * 727 *
728 * until the generic code provides a more generic hook and/or starts 728 * until the generic code provides a more generic hook and/or starts
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 028470b95886..a51cb07bd663 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -526,7 +526,7 @@ EXPORT_SYMBOL(mpc52xx_gpt_timer_period);
526 526
527#define WDT_IDENTITY "mpc52xx watchdog on GPT0" 527#define WDT_IDENTITY "mpc52xx watchdog on GPT0"
528 528
529/* wdt_is_active stores wether or not the /dev/watchdog device is opened */ 529/* wdt_is_active stores whether or not the /dev/watchdog device is opened */
530static unsigned long wdt_is_active; 530static unsigned long wdt_is_active;
531 531
532/* wdt-capable gpt */ 532/* wdt-capable gpt */
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index dca213666747..e56bb651da1a 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -728,7 +728,7 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np)
728 nid, np->full_name); 728 nid, np->full_name);
729 729
730 /* XXX todo: If we can have multiple windows on the same IOMMU, which 730 /* XXX todo: If we can have multiple windows on the same IOMMU, which
731 * isn't the case today, we probably want here to check wether the 731 * isn't the case today, we probably want here to check whether the
732 * iommu for that node is already setup. 732 * iommu for that node is already setup.
733 * However, there might be issue with getting the size right so let's 733 * However, there might be issue with getting the size right so let's
734 * ignore that for now. We might want to completely get rid of the 734 * ignore that for now. We might want to completely get rid of the
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index d8b7cc8a66ca..8e299447127e 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -148,7 +148,7 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type)
148 148
149 /* Configure the source. One gross hack that was there before and 149 /* Configure the source. One gross hack that was there before and
150 * that I've kept around is the priority to the BE which I set to 150 * that I've kept around is the priority to the BE which I set to
151 * be the same as the interrupt source number. I don't know wether 151 * be the same as the interrupt source number. I don't know whether
152 * that's supposed to make any kind of sense however, we'll have to 152 * that's supposed to make any kind of sense however, we'll have to
153 * decide that, but for now, I'm not changing the behaviour. 153 * decide that, but for now, I'm not changing the behaviour.
154 */ 154 */
@@ -220,7 +220,7 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
220/* For hooking up the cascace we have a problem. Our device-tree is 220/* For hooking up the cascace we have a problem. Our device-tree is
221 * crap and we don't know on which BE iic interrupt we are hooked on at 221 * crap and we don't know on which BE iic interrupt we are hooked on at
222 * least not the "standard" way. We can reconstitute it based on two 222 * least not the "standard" way. We can reconstitute it based on two
223 * informations though: which BE node we are connected to and wether 223 * informations though: which BE node we are connected to and whether
224 * we are connected to IOIF0 or IOIF1. Right now, we really only care 224 * we are connected to IOIF0 or IOIF1. Right now, we really only care
225 * about the IBM cell blade and we know that its firmware gives us an 225 * about the IBM cell blade and we know that its firmware gives us an
226 * interrupt-map property which is pretty strange. 226 * interrupt-map property which is pretty strange.
@@ -232,7 +232,7 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
232 int imaplen, intsize, unit; 232 int imaplen, intsize, unit;
233 struct device_node *iic; 233 struct device_node *iic;
234 234
235 /* First, we check wether we have a real "interrupts" in the device 235 /* First, we check whether we have a real "interrupts" in the device
236 * tree in case the device-tree is ever fixed 236 * tree in case the device-tree is ever fixed
237 */ 237 */
238 struct of_irq oirq; 238 struct of_irq oirq;
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index c4e630576ff2..31036b56670e 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -529,7 +529,7 @@ static int __init pmac_pic_probe_mpic(void)
529void __init pmac_pic_init(void) 529void __init pmac_pic_init(void)
530{ 530{
531 /* We configure the OF parsing based on our oldworld vs. newworld 531 /* We configure the OF parsing based on our oldworld vs. newworld
532 * platform type and wether we were booted by BootX. 532 * platform type and whether we were booted by BootX.
533 */ 533 */
534#ifdef CONFIG_PPC32 534#ifdef CONFIG_PPC32
535 if (!pmac_newworld) 535 if (!pmac_newworld)