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-alpha/system.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-alpha/system.h')
| -rw-r--r-- | include/asm-alpha/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-alpha/system.h b/include/asm-alpha/system.h index f3b7b1a59c56..03e9c0e5ed74 100644 --- a/include/asm-alpha/system.h +++ b/include/asm-alpha/system.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ALPHA_SYSTEM_H | 1 | #ifndef __ALPHA_SYSTEM_H |
| 2 | #define __ALPHA_SYSTEM_H | 2 | #define __ALPHA_SYSTEM_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <asm/pal.h> | 4 | #include <asm/pal.h> |
| 6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
| 7 | #include <asm/barrier.h> | 6 | #include <asm/barrier.h> |