diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /arch/arm/mach-pxa/pwm.c | |
| parent | x86: hpet: modify IXP400 quirk to enable interrupts (diff) | |
| parent | Linux 2.6.27-rc6 (diff) | |
| download | linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.xz linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'arch/arm/mach-pxa/pwm.c')
| -rw-r--r-- | arch/arm/mach-pxa/pwm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c index ce28cd9fed16..316cd986da5c 100644 --- a/arch/arm/mach-pxa/pwm.c +++ b/arch/arm/mach-pxa/pwm.c @@ -20,7 +20,7 @@ #include <linux/pwm.h> #include <asm/div64.h> -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> /* PWM registers and bits definitions */ #define PWMCR (0x00) |