Commit d6cd09be authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf',... 

Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf', 'spi/topic/fsl', 'spi/topic/fsl-dspi' and 'spi/topic/gpio' into spi-next
parents fab4b42a 7f6d62a2 2c658e21 38455d7a ceadfd8d 650705cf

drivers/spi/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ config SPI_FSL_CPM 
	depends on FSL_SOC



config SPI_FSL_SPI

	bool "Freescale SPI controller and Aeroflex Gaisler GRLIB SPI controller"

	tristate "Freescale SPI controller and Aeroflex Gaisler GRLIB SPI controller"

	depends on OF

	select SPI_FSL_LIB

	select SPI_FSL_CPM if FSL_SOC
@@ -302,7 +302,6 @@ config SPI_FSL_SPI 


config SPI_FSL_DSPI

	tristate "Freescale DSPI controller"

	select SPI_BITBANG

	select REGMAP_MMIO

	depends on SOC_VF610 || COMPILE_TEST

	help
@@ -310,7 +309,7 @@ config SPI_FSL_DSPI 
	  mode. VF610 platform uses the controller.



config SPI_FSL_ESPI

	bool "Freescale eSPI controller"

	tristate "Freescale eSPI controller"

	depends on FSL_SOC

	select SPI_FSL_LIB

	help

drivers/spi/spi-au1550.c

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/init.h>

drivers/spi/spi-bcm2835.c

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */



#include <linux/clk.h>

drivers/spi/spi-bcm63xx.c

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the

 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

 */



#include <linux/kernel.h>

drivers/spi/spi-bitbang.c

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/spinlock.h>