diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/asm-mips/prefetch.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-mips/prefetch.h')
| -rw-r--r-- | include/asm-mips/prefetch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/prefetch.h b/include/asm-mips/prefetch.h index 71293ec1657c..17850834ccb0 100644 --- a/include/asm-mips/prefetch.h +++ b/include/asm-mips/prefetch.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef __ASM_PREFETCH_H | 8 | #ifndef __ASM_PREFETCH_H |
| 9 | #define __ASM_PREFETCH_H | 9 | #define __ASM_PREFETCH_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * R5000 and RM5200 implements pref and prefx instructions but they're nops, so | 13 | * R5000 and RM5200 implements pref and prefx instructions but they're nops, so |