diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:49:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:49:29 -0700 |
| commit | 352d4657b23fbd329efccc396000a549e0150907 (patch) | |
| tree | 6e272c5f902d84b773ed84f8780d963cf18ef245 /arch/alpha/include/asm/core_tsunami.h | |
| parent | 95c46afe6034d15bdf0f95d69f25489cecad9a47 (diff) | |
| parent | 5286944d75cbe21dd21b0d57335cc6206622b62a (diff) | |
| download | linux-3.10-352d4657b23fbd329efccc396000a549e0150907.tar.gz linux-3.10-352d4657b23fbd329efccc396000a549e0150907.tar.bz2 linux-3.10-352d4657b23fbd329efccc396000a549e0150907.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: fix compile errors in dma-mapping-common.h
alpha: remove trailing spaces in messages
alpha: use __ratelimit
Diffstat (limited to 'arch/alpha/include/asm/core_tsunami.h')
| -rw-r--r-- | arch/alpha/include/asm/core_tsunami.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/core_tsunami.h b/arch/alpha/include/asm/core_tsunami.h index 58d4fe48742..8e39ecf0941 100644 --- a/arch/alpha/include/asm/core_tsunami.h +++ b/arch/alpha/include/asm/core_tsunami.h @@ -2,7 +2,6 @@ #define __ALPHA_TSUNAMI__H__ #include <linux/types.h> -#include <linux/pci.h> #include <asm/compiler.h> /* |