diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:13:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:13:11 -0800 |
| commit | a5222049f3e26c21ecd65bfcc9b666d4c813933b (patch) | |
| tree | f4474d66f0150b8dba8675b373a90d5509af9d75 /arch/arm/mach-iop3xx/iop321-setup.c | |
| parent | 7054ec7f86cada917626c05fe461abccca816d3b (diff) | |
| parent | d9db950cfa3d674ee834d980c329efdf8e4a0568 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-iop3xx/iop321-setup.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop321-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c index e4f4c52d93d4..0ebbcb20c6ae 100644 --- a/arch/arm/mach-iop3xx/iop321-setup.c +++ b/arch/arm/mach-iop3xx/iop321-setup.c @@ -13,7 +13,6 @@ #include <linux/mm.h> #include <linux/init.h> #include <linux/config.h> -#include <linux/init.h> #include <linux/major.h> #include <linux/fs.h> #include <linux/platform_device.h> |