summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-maciisi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-29 05:19:47 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-29 05:19:47 +0100
commite3c6d4ee545e427b55882d97d3b663c6411645fe (patch)
tree294326663fb757739a98083c2ddd570d1eaf7337 /drivers/macintosh/via-maciisi.c
parentsparc: move select of ARCH_SUPPORTS_MSI (diff)
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/p... (diff)
downloadlinux-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.xz
linux-e3c6d4ee545e427b55882d97d3b663c6411645fe.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sparc64/kernel/idprom.c
Diffstat (limited to 'drivers/macintosh/via-maciisi.c')
-rw-r--r--drivers/macintosh/via-maciisi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index 2dc788042707..4d686c0bdea0 100644
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -24,7 +24,6 @@
#include <linux/interrupt.h>
#include <asm/macintosh.h>
#include <asm/macints.h>
-#include <asm/machw.h>
#include <asm/mac_via.h>
static volatile unsigned char *via;