diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /arch/m68k/include | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (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: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/MC68EZ328.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/MC68VZ328.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h index 69b7f9139e5e..d1bde58ab0dd 100644 --- a/arch/m68k/include/asm/MC68EZ328.h +++ b/arch/m68k/include/asm/MC68EZ328.h | |||
| @@ -1047,7 +1047,7 @@ typedef volatile struct { | |||
| 1047 | 1047 | ||
| 1048 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ | 1048 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ |
| 1049 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ | 1049 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ |
| 1050 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ | 1050 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */ |
| 1051 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ | 1051 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ |
| 1052 | #define WATCHDOG_CNT_SHIFT 8 | 1052 | #define WATCHDOG_CNT_SHIFT 8 |
| 1053 | 1053 | ||
diff --git a/arch/m68k/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h index 2b9bf626a0a5..6bd1bf1f85ea 100644 --- a/arch/m68k/include/asm/MC68VZ328.h +++ b/arch/m68k/include/asm/MC68VZ328.h | |||
| @@ -1143,7 +1143,7 @@ typedef struct { | |||
| 1143 | 1143 | ||
| 1144 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ | 1144 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ |
| 1145 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ | 1145 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ |
| 1146 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ | 1146 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */ |
| 1147 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ | 1147 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ |
| 1148 | #define WATCHDOG_CNT_SHIFT 8 | 1148 | #define WATCHDOG_CNT_SHIFT 8 |
| 1149 | 1149 | ||