diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
| commit | eb703027ac4ed563823e4d7824f68afed637d89a (patch) | |
| tree | de35552440e7d2c7b74d0020c6a3cc1a8ed8b060 /drivers/misc/atmel-ssc.c | |
| parent | 429e90893c9ad2c266d541c94d6ca69a34a7701d (diff) | |
| parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/misc/atmel-ssc.c')
| -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 | ||