spi/xilinx: merge OF support code into main driver
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 14 Oct 2010 15:32:53 +0000 (09:32 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 10 Nov 2010 04:41:28 +0000 (21:41 -0700)
Now that the of_platform_bus_type has been merged with the platform
bus type, a single platform driver can handle both OF and non-OF use
cases.  This patch merges the OF support into the platform driver.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Michal Simek <monstr@monstr.eu>
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/xilinx_spi.c
drivers/spi/xilinx_spi.h [deleted file]
drivers/spi/xilinx_spi_of.c [deleted file]

Simple merge
Simple merge
Simple merge
diff --cc drivers/spi/xilinx_spi.h
Simple merge
diff --cc drivers/spi/xilinx_spi_of.c
Simple merge