diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:54:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:54:07 -0500 |
| commit | 541ef5cbb8e68189d47272cea52a69abc30259bc (patch) | |
| tree | 09c871320e6918ebb9b642a632971b364684d8a3 /arch/m68k/mac/debug.c | |
| parent | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (diff) | |
| parent | aa6eeeef78263e9891185c6cfaaf64808460a54a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: use the new byteorder headers
fbcon: Protect free_irq() by MACH_IS_ATARI check
fbcon: remove broken mac vbl handler
m68k: fix trigraph ignored warning in setox.S
macfb annotations and compiler warning fix
m68k: mac baboon interrupt enable/disable
m68k: machw.h cleanup
m68k: Mac via cleanup and commentry
m68k: Reinstate mac rtc
Diffstat (limited to 'arch/m68k/mac/debug.c')
| -rw-r--r-- | arch/m68k/mac/debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c index 2165740786a5..65dd77a742a3 100644 --- a/arch/m68k/mac/debug.c +++ b/arch/m68k/mac/debug.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #define BOOTINFO_COMPAT_1_0 | 24 | #define BOOTINFO_COMPAT_1_0 |
| 25 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
| 26 | #include <asm/bootinfo.h> | 26 | #include <asm/bootinfo.h> |
| 27 | #include <asm/machw.h> | ||
| 28 | #include <asm/macints.h> | 27 | #include <asm/macints.h> |
| 29 | 28 | ||
| 30 | extern unsigned long mac_videobase; | 29 | extern unsigned long mac_videobase; |