diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
| commit | 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 (patch) | |
| tree | f081ef10f3067b28a1ee316a8e7292eeda143419 /arch/arm/mach-iop3xx/iop331-time.c | |
| parent | 54f00389563c80fa1de250a21256313ba01ca07d (diff) | |
| parent | 2b235826098bb653982894dfc3f70fd029f6c2e4 (diff) | |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
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> |