aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/arm/Sharp-LH/IOBarrier2
-rw-r--r--drivers/mtd/devices/doc2000.c2
-rw-r--r--include/asm-arm/arch-versatile/irqs.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/arm/Sharp-LH/IOBarrier b/Documentation/arm/Sharp-LH/IOBarrier
index c0d8853672dc..2e953e228f4d 100644
--- a/Documentation/arm/Sharp-LH/IOBarrier
+++ b/Documentation/arm/Sharp-LH/IOBarrier
@@ -32,7 +32,7 @@ BARRIER IO before the access to the SMC chip because the AEN latch
32only needs occurs after the SMC IO write cycle. The routines that 32only needs occurs after the SMC IO write cycle. The routines that
33implement this work-around make an additional concession which is to 33implement this work-around make an additional concession which is to
34disable interrupts during the IO sequence. Other hardware devices 34disable interrupts during the IO sequence. Other hardware devices
35(the LogicPD CPLD) have registers in the same the physical memory 35(the LogicPD CPLD) have registers in the same physical memory
36region as the SMC chip. An interrupt might allow an access to one of 36region as the SMC chip. An interrupt might allow an access to one of
37those registers while SMC IO is being performed. 37those registers while SMC IO is being performed.
38 38
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index c73e96bfafc6..90acf57c19bd 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -376,7 +376,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip)
376 * hardware restriction. */ 376 * hardware restriction. */
377 if (doc->mfr) { 377 if (doc->mfr) {
378 if (doc->mfr == mfr && doc->id == id) 378 if (doc->mfr == mfr && doc->id == id)
379 return 1; /* This is another the same the first */ 379 return 1; /* This is the same as the first */
380 else 380 else
381 printk(KERN_WARNING 381 printk(KERN_WARNING
382 "Flash chip at floor %d, chip %d is different:\n", 382 "Flash chip at floor %d, chip %d is different:\n",
diff --git a/include/asm-arm/arch-versatile/irqs.h b/include/asm-arm/arch-versatile/irqs.h
index 745aa841b31a..f7263b99403b 100644
--- a/include/asm-arm/arch-versatile/irqs.h
+++ b/include/asm-arm/arch-versatile/irqs.h
@@ -22,7 +22,7 @@
22#include <asm/arch/platform.h> 22#include <asm/arch/platform.h>
23 23
24/* 24/*
25 * IRQ interrupts definitions are the same the INT definitions 25 * IRQ interrupts definitions are the same as the INT definitions
26 * held within platform.h 26 * held within platform.h
27 */ 27 */
28#define IRQ_VIC_START 0 28#define IRQ_VIC_START 0
@@ -94,7 +94,7 @@
94#define IRQMASK_VICSOURCE31 INTMASK_VICSOURCE31 94#define IRQMASK_VICSOURCE31 INTMASK_VICSOURCE31
95 95
96/* 96/*
97 * FIQ interrupts definitions are the same the INT definitions. 97 * FIQ interrupts definitions are the same as the INT definitions.
98 */ 98 */
99#define FIQ_WDOGINT INT_WDOGINT 99#define FIQ_WDOGINT INT_WDOGINT
100#define FIQ_SOFTINT INT_SOFTINT 100#define FIQ_SOFTINT INT_SOFTINT