diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /arch/arm | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-netx/include/mach/netx-regs.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-netx/include/mach/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h index 08c60ff227be..5a03e7ccb01a 100644 --- a/arch/arm/mach-netx/include/mach/netx-regs.h +++ b/arch/arm/mach-netx/include/mach/netx-regs.h | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | #define NETX_PA_XPEC(no) (NETX_IO_PHYS + NETX_OFS_XPEC(no)) | 80 | #define NETX_PA_XPEC(no) (NETX_IO_PHYS + NETX_OFS_XPEC(no)) |
| 81 | #define NETX_PA_VIC (NETX_IO_PHYS + NETX_OFS_VIC) | 81 | #define NETX_PA_VIC (NETX_IO_PHYS + NETX_OFS_VIC) |
| 82 | 82 | ||
| 83 | /* virual addresses */ | 83 | /* virtual addresses */ |
| 84 | #define NETX_VA_SYSTEM (NETX_IO_VIRT + NETX_OFS_SYSTEM) | 84 | #define NETX_VA_SYSTEM (NETX_IO_VIRT + NETX_OFS_SYSTEM) |
| 85 | #define NETX_VA_MEMCR (NETX_IO_VIRT + NETX_OFS_MEMCR) | 85 | #define NETX_VA_MEMCR (NETX_IO_VIRT + NETX_OFS_MEMCR) |
| 86 | #define NETX_VA_DPMAS (NETX_IO_VIRT + NETX_OFS_DPMAS) | 86 | #define NETX_VA_DPMAS (NETX_IO_VIRT + NETX_OFS_DPMAS) |
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 3f325d3718a9..cd8de89c5fad 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
| @@ -109,7 +109,7 @@ config MACH_OMAP_PALMZ71 | |||
| 109 | help | 109 | help |
| 110 | Support for the Palm Zire71 PDA. To boot the kernel, | 110 | Support for the Palm Zire71 PDA. To boot the kernel, |
| 111 | you'll need a PalmOS compatible bootloader; check out | 111 | you'll need a PalmOS compatible bootloader; check out |
| 112 | http://hackndev.com/palm/z71 for more informations. | 112 | http://hackndev.com/palm/z71 for more information. |
| 113 | Say Y here if you have such a PDA, say N otherwise. | 113 | Say Y here if you have such a PDA, say N otherwise. |
| 114 | 114 | ||
| 115 | config MACH_OMAP_PALMTT | 115 | config MACH_OMAP_PALMTT |