diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-02 23:22:11 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-02 23:22:11 +0100 |
| commit | cd02938a828f4b2098a074afb7454f106f2e8df5 (patch) | |
| tree | 7b543fd6aa82a62dc3a9614c26f89daca83e77d5 /drivers/media/video/ivtv/ivtv-firmware.c | |
| parent | 9d681f3a1b27fdfc17ea251cf8d5f627dab34670 (diff) | |
| parent | 172ef275444efa12d834fb9d1b1acdac92db47f7 (diff) | |
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-firmware.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c index 6dba55b7e25a..c1b7ec475c27 100644 --- a/drivers/media/video/ivtv/ivtv-firmware.c +++ b/drivers/media/video/ivtv/ivtv-firmware.c @@ -52,7 +52,7 @@ static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv int retries = 3; retry: - if (retries && request_firmware(&fw, fn, &itv->dev->dev) == 0) { + if (retries && request_firmware(&fw, fn, &itv->pdev->dev) == 0) { int i; volatile u32 __iomem *dst = (volatile u32 __iomem *)mem; const u32 *src = (const u32 *)fw->data; |