summaryrefslogtreecommitdiffstats
path: root/drivers/spi/xilinx_spi_of.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-05-25 00:38:26 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-05-25 00:38:26 -0600
commitb1e50ebcf24668e57f058deb48b0704b5391ed0f (patch)
tree17e1b69b249d0738317b732186340c9dd053f1a1 /drivers/spi/xilinx_spi_of.c
parent0c2a2ae32793e3500a15a449612485f5d17dd431 (diff)
parent7e125f7b9cbfce4101191b8076d606c517a73066 (diff)
downloadop-kernel-dev-b1e50ebcf24668e57f058deb48b0704b5391ed0f.zip
op-kernel-dev-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.gz
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'drivers/spi/xilinx_spi_of.c')
-rw-r--r--drivers/spi/xilinx_spi_of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c
index 748d33a..55c5801 100644
--- a/drivers/spi/xilinx_spi_of.c
+++ b/drivers/spi/xilinx_spi_of.c
@@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {
MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
static struct of_platform_driver xilinx_spi_of_driver = {
- .match_table = xilinx_spi_of_match,
.probe = xilinx_spi_of_probe,
.remove = __exit_p(xilinx_spi_of_remove),
.driver = {
.name = "xilinx-xps-spi",
.owner = THIS_MODULE,
+ .of_match_table = xilinx_spi_of_match,
},
};
OpenPOWER on IntegriCloud