diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/arm/mach-integrator/clock.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/arm/mach-integrator/clock.c')
| -rw-r--r-- | arch/arm/mach-integrator/clock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c index 56200594db3c..73c360685cad 100644 --- a/arch/arm/mach-integrator/clock.c +++ b/arch/arm/mach-integrator/clock.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/string.h> | ||
| 16 | 17 | ||
| 17 | #include <asm/semaphore.h> | 18 | #include <asm/semaphore.h> |
| 18 | #include <asm/hardware/clock.h> | 19 | #include <asm/hardware/clock.h> |