Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x-psc', 'spi/topic/mpc52xx', 'spi/topic/mxs', 'spi/topic/nuc900', 'spi/topic/oc-tiny' and 'spi/topic/octeon' into spi-next

2014-03-30 00:51:17 +00:00
parent 3bcbc14911 8fc39b5166 3a44623d5e 3d8c869796 5c5989ccd3 cdd1945bde fb534f1075 14c48ab2d9 7984b5ca5c
commit 6e07b9179a
30 changed files with 29 additions and 146 deletions
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -9,7 +9,6 @@
 */

 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>