diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/pcmcia/pxa2xx_lubbock.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/pcmcia/pxa2xx_lubbock.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_lubbock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c index fd1f691c7c2c..a92f11143c43 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/pxa2xx_lubbock.c | |||
| @@ -260,7 +260,7 @@ int __init pcmcia_lubbock_init(struct sa1111_dev *sadev) | |||
| 260 | lubbock_set_misc_wr((1 << 15) | (1 << 14), 0); | 260 | lubbock_set_misc_wr((1 << 15) | (1 << 14), 0); |
| 261 | 261 | ||
| 262 | sadev->dev.platform_data = &lubbock_pcmcia_ops; | 262 | sadev->dev.platform_data = &lubbock_pcmcia_ops; |
| 263 | ret = pxa2xx_drv_pcmcia_probe(&sadev->dev); | 263 | ret = __pxa2xx_drv_pcmcia_probe(&sadev->dev); |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | return ret; | 266 | return ret; |