diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 13:03:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 13:03:00 -0400 |
| commit | 7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 (patch) | |
| tree | e1831a744561fed3a0316162d702d58fea9c85e9 /drivers/misc | |
| parent | b0d8aa081bcb2d396a257ae5b3be8c1b3006bfa4 (diff) | |
| parent | 3c26e17032e42cfbe606882288223ad6146e4c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: some mmc/sd cleanups
include/video/atmel_lcdc.h must #include <linux/workqueue.h>
avr32: allow system timer to share interrupt to make OProfile work
drivers/misc/atmel-ssc.c: Removed duplicated include
avr32: Add platform data for AC97C platform device
avr32: clean up mci platform code
fix avr32 build errors
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/atmel-ssc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index e171650766ce..bf5e4d065436 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/clk.h> | 13 | #include <linux/clk.h> |
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 18 | #include <linux/atmel-ssc.h> | 17 | #include <linux/atmel-ssc.h> |
| 19 | 18 | ||