diff options
author | Anatolij Gustschin <agust@denx.de> | 2010-06-02 19:38:57 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-06-02 23:02:38 -0400 |
commit | 2005ce3521b7a38f12085e0420f405a8ee06f606 (patch) | |
tree | 86b51df7afe4371f1b1af5df6f3caaf63d8c725b /drivers/pcmcia/m8xx_pcmcia.c | |
parent | 295bdd9c52e57daf995fe80eff8c53938443fa2f (diff) |
of/pcmcia: m8xx_pcmcia.c: Fix build failures
Fixes build errors caused by the:
- OF device_node pointer being moved into struct device
- typo in match_table field in the struct device_driver
(which shoud be of_match_table)
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/pcmcia/m8xx_pcmcia.c')
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 1a648b90b634..25e5e30a18af 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1157,7 +1157,7 @@ static int __init m8xx_probe(struct of_device *ofdev, | |||
1157 | unsigned int i, m, hwirq; | 1157 | unsigned int i, m, hwirq; |
1158 | pcmconf8xx_t *pcmcia; | 1158 | pcmconf8xx_t *pcmcia; |
1159 | int status; | 1159 | int status; |
1160 | struct device_node *np = ofdev->node; | 1160 | struct device_node *np = ofdev->dev.of_node; |
1161 | 1161 | ||
1162 | pcmcia_info("%s\n", version); | 1162 | pcmcia_info("%s\n", version); |
1163 | 1163 | ||
@@ -1301,7 +1301,7 @@ static struct of_platform_driver m8xx_pcmcia_driver = { | |||
1301 | .driver = { | 1301 | .driver = { |
1302 | .name = driver_name, | 1302 | .name = driver_name, |
1303 | .owner = THIS_MODULE, | 1303 | .owner = THIS_MODULE, |
1304 | .match_table = m8xx_pcmcia_match, | 1304 | .of_match_table = m8xx_pcmcia_match, |
1305 | }, | 1305 | }, |
1306 | .probe = m8xx_probe, | 1306 | .probe = m8xx_probe, |
1307 | .remove = m8xx_remove, | 1307 | .remove = m8xx_remove, |