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 /drivers/scsi | |
| 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 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/mac_scsi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 0248919bc2d..bf2a1c51629 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | 47 | ||
| 48 | #include <asm/macintosh.h> | 48 | #include <asm/macintosh.h> |
| 49 | #include <asm/macints.h> | 49 | #include <asm/macints.h> |
| 50 | #include <asm/machw.h> | ||
| 51 | #include <asm/mac_via.h> | 50 | #include <asm/mac_via.h> |
| 52 | 51 | ||
| 53 | #include "scsi.h" | 52 | #include "scsi.h" |