diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
commit | 2b235826098bb653982894dfc3f70fd029f6c2e4 (patch) | |
tree | ec525ddba74f58017a3f145bb68cf94376648c1c /arch/arm/mach-iop3xx/iop331-time.c | |
parent | b4b52db71529bbe46da914eda772fb574914c94d (diff) | |
parent | c77054e518d9163578cfcad09826d7b959f95ece (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-iop3xx/iop331-time.c')
-rw-r--r-- | arch/arm/mach-iop3xx/iop331-time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c index 8eddfac7e2b0..3c1f0ebbd636 100644 --- a/arch/arm/mach-iop3xx/iop331-time.c +++ b/arch/arm/mach-iop3xx/iop331-time.c @@ -23,7 +23,6 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/uaccess.h> -#include <asm/mach-types.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> |