diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/pwm.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/pwm.h')
| -rw-r--r-- | include/linux/pwm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 3945f803d514..7c775751392c 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h | |||
| @@ -28,4 +28,4 @@ int pwm_enable(struct pwm_device *pwm); | |||
| 28 | */ | 28 | */ |
| 29 | void pwm_disable(struct pwm_device *pwm); | 29 | void pwm_disable(struct pwm_device *pwm); |
| 30 | 30 | ||
| 31 | #endif /* __ASM_ARCH_PWM_H */ | 31 | #endif /* __LINUX_PWM_H */ |