summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/marvell-ccic/cafe-driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 06:59:44 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 08:46:34 -0300
commit7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a (patch)
treeb530832a93119bb6852431769843a9364fe5ad70 /drivers/media/platform/marvell-ccic/cafe-driver.c
parent08fe9f7ddf31b8c42dd1a689b0a2c1501f10b58c (diff)
downloadblackbird-op-linux-7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a.tar.gz
blackbird-op-linux-7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a.zip
[media] marvell-ccic: remove g_chip_ident
Remove g_chip_ident. This driver used some of the V4L2_IDENT defines, replace those with a driver-specific enum. This makes it possible to drop the v4l2-chip-ident.h define as well. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic/cafe-driver.c')
-rw-r--r--drivers/media/platform/marvell-ccic/cafe-driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell-ccic/cafe-driver.c
index d030f9beae88..7b07fc55cd3c 100644
--- a/drivers/media/platform/marvell-ccic/cafe-driver.c
+++ b/drivers/media/platform/marvell-ccic/cafe-driver.c
@@ -27,7 +27,6 @@
#include <linux/slab.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
-#include <media/v4l2-chip-ident.h>
#include <linux/device.h>
#include <linux/wait.h>
#include <linux/delay.h>
@@ -469,7 +468,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
goto out;
cam->pdev = pdev;
mcam = &cam->mcam;
- mcam->chip_id = V4L2_IDENT_CAFE;
+ mcam->chip_id = MCAM_CAFE;
spin_lock_init(&mcam->dev_lock);
init_waitqueue_head(&cam->smbus_wait);
mcam->plat_power_up = cafe_ctlr_power_up;
OpenPOWER on IntegriCloud