Commit 6e07b917 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init',... 

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
parents 3bcbc149 8fc39b51 3a44623d 3d8c8697 5c5989cc cdd1945b fb534f10 14c48ab2 7984b5ca

drivers/spi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ config SPI_IMX 
	tristate "Freescale i.MX SPI controllers"

	depends on ARCH_MXC || COMPILE_TEST

	select SPI_BITBANG

	default m if IMX_HAVE_PLATFORM_SPI_IMX

	help

	  This enables using the Freescale i.MX SPI controllers in master

	  mode.

drivers/spi/spi-altera.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/errno.h>

#include <linux/module.h>

drivers/spi/spi-ath79.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>

drivers/spi/spi-atmel.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/spi/spi-bcm63xx.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/module.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE