git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.36' into kbuild/misc
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
core_mcpcia.h
diff --git
a/arch/alpha/include/asm/core_mcpcia.h
b/arch/alpha/include/asm/core_mcpcia.h
index
acf55b4
..
21ac533
100644
(file)
--- a/
arch/alpha/include/asm/core_mcpcia.h
+++ b/
arch/alpha/include/asm/core_mcpcia.h
@@
-6,7
+6,6
@@
#define MCPCIA_ONE_HAE_WINDOW 1
#include <linux/types.h>
-#include <linux/pci.h>
#include <asm/compiler.h>
/*