diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:36:41 -0400 |
| commit | 6ae85d6db4871d8dbcb5cc0e9056f97f1ca07061 (patch) | |
| tree | d0a6fa2e4fcef36a4c80990a361c0d5fbe091c35 /arch/arm/plat-orion | |
| parent | d72cd3a90e4d6725b62919139e2ab7bd926fa16d (diff) | |
| parent | fdd8b079e33d4711527ace19798e9db99a056469 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5460/1: Orion: reduce namespace pollution
[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
[ARM] 5457/1: mach-imx gpio buildfix
[ARM] 5456/1: add sys_preadv and sys_pwritev
[ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
[ARM] pxa/palm27x: General fix for Palm27x aSoC driver
[ARM] pxa/mioa701: use GPIO95 as AC97 reset line
[ARM] pxa: merge AC97 platform data structures
[ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
Diffstat (limited to 'arch/arm/plat-orion')
| -rw-r--r-- | arch/arm/plat-orion/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 2faf9dba4ef7..de8a001fc3a9 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 18 | #include <asm/mach/time.h> | 18 | #include <asm/mach/time.h> |
| 19 | #include <mach/hardware.h> | 19 | #include <mach/bridge-regs.h> |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * Number of timer ticks per jiffy. | 22 | * Number of timer ticks per jiffy. |