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-frv/atomic.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| download | kernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.gz kernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz kernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-frv/atomic.h')
| -rw-r--r-- | include/asm-frv/atomic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index 5d9f84bfdca..9a4ff03c396 100644 --- a/include/asm-frv/atomic.h +++ b/include/asm-frv/atomic.h @@ -14,7 +14,6 @@ #ifndef _ASM_ATOMIC_H #define _ASM_ATOMIC_H -#include <linux/config.h> #include <linux/types.h> #include <asm/spr-regs.h> |