diff options
| author | Jonathan Corbet | 2011-06-11 19:46:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-07-27 22:53:01 +0200 |
| commit | 595a93a47a3b7dc1be84160fbd73b1406074f411 (patch) | |
| tree | a39b1ced0360d377fe7f4d167a2116e9b87cde88 /drivers/media/video/marvell-ccic/mcam-core.h | |
| parent | [media] marvell-cam: Right-shift i2c slave ID's in the cafe driver (diff) | |
| download | kernel-qcow2-linux-595a93a47a3b7dc1be84160fbd73b1406074f411.tar.gz kernel-qcow2-linux-595a93a47a3b7dc1be84160fbd73b1406074f411.tar.xz kernel-qcow2-linux-595a93a47a3b7dc1be84160fbd73b1406074f411.zip | |
[media] marvell-cam: Allocate the i2c adapter in the platform driver
The upcoming mmp-camera driver will need an i2c_adapter structure allocated
externally, so change the core adapter to a pointer and require the
platform code to fill it in.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/marvell-ccic/mcam-core.h')
| -rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h index e8a7de05100b..5effa8203412 100644 --- a/drivers/media/video/marvell-ccic/mcam-core.h +++ b/drivers/media/video/marvell-ccic/mcam-core.h @@ -37,7 +37,7 @@ struct mcam_camera { * These fields should be set by the platform code prior to * calling mcam_register(). */ - struct i2c_adapter i2c_adapter; + struct i2c_adapter *i2c_adapter; unsigned char __iomem *regs; spinlock_t dev_lock; struct device *dev; /* For messages, dma alloc */ |