summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 17:08:43 +0100
committerMark Brown <broonie@linaro.org>2014-06-02 17:08:43 +0100
commit69e25c755722056b57892bebeb1892e3a6fe8774 (patch)
tree9621302e63287eabe8aa26b3cde9e18ef8890299 /drivers/spi/spi-pxa2xx.c
parent301d8384b5516596cf53b88478b4b379aa09208a (diff)
parente4745fef5595df7405ea24d6b21ba0e65332bb8e (diff)
downloadblackbird-op-linux-69e25c755722056b57892bebeb1892e3a6fe8774.tar.gz
blackbird-op-linux-69e25c755722056b57892bebeb1892e3a6fe8774.zip
Merge remote-tracking branch 'spi/topic/workqueue' into spi-next
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r--drivers/spi/spi-pxa2xx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 901d0e0ba3eb..a98df7eeb42d 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -27,7 +27,6 @@
#include <linux/platform_device.h>
#include <linux/spi/pxa2xx_spi.h>
#include <linux/spi/spi.h>
-#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/slab.h>
OpenPOWER on IntegriCloud