diff options
author | 2006-06-22 22:51:46 -0400 | |
---|---|---|
committer | 2006-06-22 22:51:46 -0400 | |
commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/asm-cris/arch-v10/system.h | |
parent | [PATCH] s2io: netpoll support (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
download | linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-cris/arch-v10/system.h')
-rw-r--r-- | include/asm-cris/arch-v10/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v10/system.h b/include/asm-cris/arch-v10/system.h index 1ac7b639b1b0..4a9cd36c9e16 100644 --- a/include/asm-cris/arch-v10/system.h +++ b/include/asm-cris/arch-v10/system.h @@ -1,7 +1,6 @@ #ifndef __ASM_CRIS_ARCH_SYSTEM_H #define __ASM_CRIS_ARCH_SYSTEM_H -#include <linux/config.h> /* read the CPU version register */ |