diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 02:25:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 02:25:48 +0100 |
| commit | 9ca0e5474d11ca044e0aacfa6e78bf17957118d2 (patch) | |
| tree | 2ffa4b51a73070e41b53644e0adfd39adf1eb501 /drivers/pcmcia/pxa2xx_lubbock.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff) | |
| parent | [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) (diff) | |
| download | linux-9ca0e5474d11ca044e0aacfa6e78bf17957118d2.tar.xz linux-9ca0e5474d11ca044e0aacfa6e78bf17957118d2.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B)
[ARM] 3913/1: n2100: fix IRQ routing for second ethernet port
[ARM] Add KBUILD_IMAGE target support
[ARM] Fix suspend oops caused by PXA2xx PCMCIA driver
[ARM] Fix i2c-pxa slave mode support
[ARM] 3900/1: Fix VFP Division by Zero exception handling.
[ARM] 3899/1: Fix the normalization of the denormal double precision number.
[ARM] 3909/1: Disable UWIND_INFO for ARM (again)
[ARM] Add __must_check to uaccess functions
[ARM] Add realview SMP default configuration
[ARM] Fix SMP irqflags support
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) lubbock_set_misc_wr((1 << 15) | (1 << 14), 0); sadev->dev.platform_data = &lubbock_pcmcia_ops; - ret = pxa2xx_drv_pcmcia_probe(&sadev->dev); + ret = __pxa2xx_drv_pcmcia_probe(&sadev->dev); } return ret; |