diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
| commit | 9585da3729e7e27bf22818625c10ac6c64ebb609 (patch) | |
| tree | 8c8d46f7f2cc933fdf75a6a75cf593a63f7b8717 /arch/arm/mach-iop3xx/iop321-setup.c | |
| parent | 8080d5497146d5d27d9e8e78229d1adc7fe280cf (diff) | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
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 @@ | |||
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/major.h> | 16 | #include <linux/major.h> |
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |