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-xtensa/system.h | |
parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
download | blackbird-op-linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.gz blackbird-op-linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-xtensa/system.h')
-rw-r--r-- | include/asm-xtensa/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h index b29f7ae6a08a..f986170bd2a1 100644 --- a/include/asm-xtensa/system.h +++ b/include/asm-xtensa/system.h @@ -11,7 +11,6 @@ #ifndef _XTENSA_SYSTEM_H #define _XTENSA_SYSTEM_H -#include <linux/config.h> #include <linux/stringify.h> #include <asm/processor.h> |