spi/xilinx: fold platform_driver support into main body
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 14 Oct 2010 15:04:29 +0000 (09:04 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 10 Nov 2010 04:41:27 +0000 (21:41 -0700)
This patch merges the platform driver support into the main body of
xilinx_spi.c in preparation for merging the OF and non-OF support
code.

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_pltfm.c [deleted file]

Simple merge
Simple merge
Simple merge
diff --cc drivers/spi/xilinx_spi_pltfm.c
Simple merge