diff options
| author | Linus Torvalds | 2008-12-28 21:54:07 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-12-28 21:54:07 +0100 |
| commit | 541ef5cbb8e68189d47272cea52a69abc30259bc (patch) | |
| tree | 09c871320e6918ebb9b642a632971b364684d8a3 /drivers/macintosh/via-cuda.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 (diff) | |
| parent | m68k: use the new byteorder headers (diff) | |
| download | kernel-qcow2-linux-541ef5cbb8e68189d47272cea52a69abc30259bc.tar.gz kernel-qcow2-linux-541ef5cbb8e68189d47272cea52a69abc30259bc.tar.xz kernel-qcow2-linux-541ef5cbb8e68189d47272cea52a69abc30259bc.zip | |
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 'drivers/macintosh/via-cuda.c')
| -rw-r--r-- | drivers/macintosh/via-cuda.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index 741a93a3eb61..62dd1fdafecf 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c @@ -23,7 +23,6 @@ #else #include <asm/macintosh.h> #include <asm/macints.h> -#include <asm/machw.h> #include <asm/mac_via.h> #endif #include <asm/io.h> |