diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
commit | 75329f1f0c0e2e2ad611734a2ef08309391a4d9f (patch) | |
tree | 67ca1a13f51fbf2f5af8557e6ff0bb722efab3e6 /drivers/ide | |
parent | b6b301aa9fba57b114c3a00f5f43abf672bd4ecd (diff) | |
parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
download | kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.tar.gz kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.tar.xz kernel-crypto-75329f1f0c0e2e2ad611734a2ef08309391a4d9f.zip |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/macide.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c index 43f97cc1d30..3c60064f1d4 100644 --- a/drivers/ide/macide.c +++ b/drivers/ide/macide.c @@ -18,7 +18,6 @@ #include <linux/delay.h> #include <linux/ide.h> -#include <asm/machw.h> #include <asm/macintosh.h> #include <asm/macints.h> #include <asm/mac_baboon.h> |