diff options
author | Alan Cox <alan@linux.intel.com> | 2012-06-14 08:54:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-18 18:52:05 -0400 |
commit | 099987f0aaf28771261b91a41240b9228f2e32b2 (patch) | |
tree | e2eb7fbe49e98dc8ff436754d00b8c928090c727 /drivers | |
parent | 2bece307c96270fc3fdb2cc0ad8b918c26897b95 (diff) |
[media] smia: Fix compile failures
Fix compile of smia code.
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43337
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/smiapp/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/smiapp/smiapp-core.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/smiapp/Kconfig b/drivers/media/video/smiapp/Kconfig index f7b35ff443bf..fb99ff18be07 100644 --- a/drivers/media/video/smiapp/Kconfig +++ b/drivers/media/video/smiapp/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config VIDEO_SMIAPP | 1 | config VIDEO_SMIAPP |
2 | tristate "SMIA++/SMIA sensor support" | 2 | tristate "SMIA++/SMIA sensor support" |
3 | depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API | 3 | depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAVE_CLK |
4 | select VIDEO_SMIAPP_PLL | 4 | select VIDEO_SMIAPP_PLL |
5 | ---help--- | 5 | ---help--- |
6 | This is a generic driver for SMIA++/SMIA camera modules. | 6 | This is a generic driver for SMIA++/SMIA camera modules. |
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c index f518026cb67b..e8c93c89265a 100644 --- a/drivers/media/video/smiapp/smiapp-core.c +++ b/drivers/media/video/smiapp/smiapp-core.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/gpio.h> | 32 | #include <linux/gpio.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include <linux/regulator/consumer.h> | 34 | #include <linux/regulator/consumer.h> |
35 | #include <linux/slab.h> | ||
35 | #include <linux/v4l2-mediabus.h> | 36 | #include <linux/v4l2-mediabus.h> |
36 | #include <media/v4l2-device.h> | 37 | #include <media/v4l2-device.h> |
37 | 38 | ||