diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 12:08:43 -0400 |
| commit | 69e25c755722056b57892bebeb1892e3a6fe8774 (patch) | |
| tree | 9621302e63287eabe8aa26b3cde9e18ef8890299 /drivers/spi/spi-sh-sci.c | |
| parent | 301d8384b5516596cf53b88478b4b379aa09208a (diff) | |
| parent | e4745fef5595df7405ea24d6b21ba0e65332bb8e (diff) | |
Merge remote-tracking branch 'spi/topic/workqueue' into spi-next
Diffstat (limited to 'drivers/spi/spi-sh-sci.c')
| -rw-r--r-- | drivers/spi/spi-sh-sci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c index 8b44b71f5024..1f56ef651d1a 100644 --- a/drivers/spi/spi-sh-sci.c +++ b/drivers/spi/spi-sh-sci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 19 | #include <linux/workqueue.h> | ||
| 20 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 21 | 20 | ||
| 22 | #include <linux/spi/spi.h> | 21 | #include <linux/spi/spi.h> |