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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
core_titan.h
diff --git
a/arch/alpha/include/asm/core_titan.h
b/arch/alpha/include/asm/core_titan.h
index
a17f6f3
..
8cf79d1
100644
(file)
--- a/
arch/alpha/include/asm/core_titan.h
+++ b/
arch/alpha/include/asm/core_titan.h
@@
-2,7
+2,6
@@
#define __ALPHA_TITAN__H__
#include <linux/types.h>
#define __ALPHA_TITAN__H__
#include <linux/types.h>
-#include <linux/pci.h>
#include <asm/compiler.h>
/*
#include <asm/compiler.h>
/*