diff options
| author | Linus Torvalds | 2005-06-28 00:00:10 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-28 00:00:10 +0200 |
| commit | 8b789b7d7e9b12b086d6d2f0759073a11447c7e7 (patch) | |
| tree | d14d2475f9f71e27bc60f20d6400a3a05b64f62b /include | |
| parent | Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | [PATCH] ARM: 2759/1: Fix IXP4xx debug code (again) (diff) | |
| download | kernel-qcow2-linux-8b789b7d7e9b12b086d6d2f0759073a11447c7e7.tar.gz kernel-qcow2-linux-8b789b7d7e9b12b086d6d2f0759073a11447c7e7.tar.xz kernel-qcow2-linux-8b789b7d7e9b12b086d6d2f0759073a11447c7e7.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/debug-macro.S | 2 | ||||
| -rw-r--r-- | include/asm-arm/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/io.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/mach/time.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S index 45a6c6cc29d5..2e23651e217f 100644 --- a/include/asm-arm/arch-ixp4xx/debug-macro.S +++ b/include/asm-arm/arch-ixp4xx/debug-macro.S @@ -14,8 +14,8 @@ mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? moveq \rx, #0xc8000000 - orrne \rx, \rx, #0x00b00000 movne \rx, #0xff000000 + orrne \rx, \rx, #0x00b00000 add \rx,\rx,#3 @ Uart regs are at off set of 3 if @ byte writes used - Big Endian. .endm diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h index 2114acb3d237..4f68c8a5a199 100644 --- a/include/asm-arm/ide.h +++ b/include/asm-arm/ide.h @@ -5,7 +5,7 @@ */ /* - * This file contains the i386 architecture specific IDE code. + * This file contains the ARM architecture specific IDE code. */ #ifndef __ASMARM_IDE_H diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index cc4b5f5dbfcf..cfa71a0dffb6 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn); * only. Their primary purpose is to access PCI and ISA peripherals. * * Note that for a big endian machine, this implies that the following - * big endian mode connectivity is in place, as described by numerious + * big endian mode connectivity is in place, as described by numerous * ARM documents: * * PCI: D0-D7 D8-D15 D16-D23 D24-D31 diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h index 047980ad18d1..2cf279a44017 100644 --- a/include/asm-arm/mach/time.h +++ b/include/asm-arm/mach/time.h @@ -60,6 +60,8 @@ struct dyn_tick_timer { }; void timer_dyn_reprogram(void); +#else +#define timer_dyn_reprogram() do { } while (0) #endif extern struct sys_timer *system_timer; |