diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/misc/atmel_pwm.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/atmel_pwm.c')
| -rw-r--r-- | drivers/misc/atmel_pwm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c index 6aa5294dfec4..0f3fb4f03bdf 100644 --- a/drivers/misc/atmel_pwm.c +++ b/drivers/misc/atmel_pwm.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/clk.h> | 2 | #include <linux/clk.h> |
| 3 | #include <linux/err.h> | 3 | #include <linux/err.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/io.h> | 5 | #include <linux/io.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 6 | #include <linux/platform_device.h> | 7 | #include <linux/platform_device.h> |