aboutsummaryrefslogtreecommitdiffstats
path: root/arch/v850/kernel/me2.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/v850/kernel/me2.c
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
Diffstat (limited to 'arch/v850/kernel/me2.c')
-rw-r--r--arch/v850/kernel/me2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/v850/kernel/me2.c b/arch/v850/kernel/me2.c
index 38be5c194f6b..007115dc9ce0 100644
--- a/arch/v850/kernel/me2.c
+++ b/arch/v850/kernel/me2.c
@@ -58,13 +58,13 @@ void __init me2_init_irqs (void)
58void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) 58void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud)
59{ 59{
60 if (chan == 0) { 60 if (chan == 0) {
61 /* Specify that the relevent pins on the chip should do 61 /* Specify that the relevant pins on the chip should do
62 serial I/O, not direct I/O. */ 62 serial I/O, not direct I/O. */
63 ME2_PORT1_PMC |= 0xC; 63 ME2_PORT1_PMC |= 0xC;
64 /* Specify that we're using the UART, not the CSI device. */ 64 /* Specify that we're using the UART, not the CSI device. */
65 ME2_PORT1_PFC |= 0xC; 65 ME2_PORT1_PFC |= 0xC;
66 } else if (chan == 1) { 66 } else if (chan == 1) {
67 /* Specify that the relevent pins on the chip should do 67 /* Specify that the relevant pins on the chip should do
68 serial I/O, not direct I/O. */ 68 serial I/O, not direct I/O. */
69 ME2_PORT2_PMC |= 0x6; 69 ME2_PORT2_PMC |= 0x6;
70 /* Specify that we're using the UART, not the CSI device. */ 70 /* Specify that we're using the UART, not the CSI device. */