aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Makefile2
-rw-r--r--arch/mips/pci/fixup-sb1250.c4
-rw-r--r--arch/powerpc/platforms/cell/io-workarounds.c2
-rw-r--r--arch/v850/kernel/entry.S2
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index f2f742df32c7..4892db88a86a 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -92,7 +92,7 @@ cflags-y += -ffreestanding
92# when fed the toolchain default! 92# when fed the toolchain default!
93# 93#
94# Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of 94# Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of
95# 2006-10-10 don't properly change the the predefined symbols if -EB / -EL 95# 2006-10-10 don't properly change the predefined symbols if -EB / -EL
96# are used, so we kludge that here. A bug has been filed at 96# are used, so we kludge that here. A bug has been filed at
97# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. 97# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413.
98# 98#
diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c
index 7a7444874e80..0ad39e53f7b1 100644
--- a/arch/mips/pci/fixup-sb1250.c
+++ b/arch/mips/pci/fixup-sb1250.c
@@ -14,7 +14,7 @@
14#include <linux/pci.h> 14#include <linux/pci.h>
15 15
16/* 16/*
17 * Set the the BCM1250, etc. PCI host bridge's TRDY timeout 17 * Set the BCM1250, etc. PCI host bridge's TRDY timeout
18 * to the finite max. 18 * to the finite max.
19 */ 19 */
20static void __init quirk_sb1250_pci(struct pci_dev *dev) 20static void __init quirk_sb1250_pci(struct pci_dev *dev)
@@ -35,7 +35,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_HT,
35 quirk_sb1250_ht); 35 quirk_sb1250_ht);
36 36
37/* 37/*
38 * Set the the SP1011 HT/PCI bridge's TRDY timeout to the finite max. 38 * Set the SP1011 HT/PCI bridge's TRDY timeout to the finite max.
39 */ 39 */
40static void __init quirk_sp1011(struct pci_dev *dev) 40static void __init quirk_sp1011(struct pci_dev *dev)
41{ 41{
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index d68d920eb2c4..7fb92f23f380 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -74,7 +74,7 @@ static void spider_io_flush(const volatile void __iomem *addr)
74 /* Fast path if we have a non-0 token, it indicates which bus we 74 /* Fast path if we have a non-0 token, it indicates which bus we
75 * are on. 75 * are on.
76 * 76 *
77 * If the token is 0, that means either the the ioremap was done 77 * If the token is 0, that means either that the ioremap was done
78 * before we initialized this layer, or it's a PIO operation. We 78 * before we initialized this layer, or it's a PIO operation. We
79 * fallback to a low path in this case. Hopefully, internal devices 79 * fallback to a low path in this case. Hopefully, internal devices
80 * which are ioremap'ed early should use in_XX/out_XX functions 80 * which are ioremap'ed early should use in_XX/out_XX functions
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index 8bc521ca081f..e4327a8d6bcd 100644
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -523,7 +523,7 @@ END(ret_from_trap)
523 523
524 524
525/* This the initial entry point for a new child thread, with an appropriate 525/* This the initial entry point for a new child thread, with an appropriate
526 stack in place that makes it look the the child is in the middle of an 526 stack in place that makes it look that the child is in the middle of an
527 syscall. This function is actually `returned to' from switch_thread 527 syscall. This function is actually `returned to' from switch_thread
528 (copy_thread makes ret_from_fork the return address in each new thread's 528 (copy_thread makes ret_from_fork the return address in each new thread's
529 saved context). */ 529 saved context). */