aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/smiapp-pll.c2
-rw-r--r--drivers/media/video/smiapp/Kconfig7
-rw-r--r--drivers/media/video/smiapp/smiapp-core.c2
-rw-r--r--drivers/media/video/smiapp/smiapp-debug.h32
-rw-r--r--drivers/media/video/smiapp/smiapp-quirk.c2
-rw-r--r--drivers/media/video/smiapp/smiapp-regs.c2
6 files changed, 0 insertions, 47 deletions
diff --git a/drivers/media/video/smiapp-pll.c b/drivers/media/video/smiapp-pll.c
index 501da413dfad..a416e27a4282 100644
--- a/drivers/media/video/smiapp-pll.c
+++ b/drivers/media/video/smiapp-pll.c
@@ -22,8 +22,6 @@
22 * 22 *
23 */ 23 */
24 24
25#include "smiapp/smiapp-debug.h"
26
27#include <linux/gcd.h> 25#include <linux/gcd.h>
28#include <linux/lcm.h> 26#include <linux/lcm.h>
29#include <linux/module.h> 27#include <linux/module.h>
diff --git a/drivers/media/video/smiapp/Kconfig b/drivers/media/video/smiapp/Kconfig
index 9504c436a5ca..f7b35ff443bf 100644
--- a/drivers/media/video/smiapp/Kconfig
+++ b/drivers/media/video/smiapp/Kconfig
@@ -4,10 +4,3 @@ config VIDEO_SMIAPP
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.
7
8config VIDEO_SMIAPP_DEBUG
9 bool "Enable debugging for the generic SMIA++/SMIA driver"
10 depends on VIDEO_SMIAPP
11 ---help---
12 Enable debugging output in the generic SMIA++/SMIA driver. If you
13 are developing the driver you might want to enable this.
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index 3991c452acb2..a8a1db9563b1 100644
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -26,8 +26,6 @@
26 * 26 *
27 */ 27 */
28 28
29#include "smiapp-debug.h"
30
31#include <linux/delay.h> 29#include <linux/delay.h>
32#include <linux/device.h> 30#include <linux/device.h>
33#include <linux/gpio.h> 31#include <linux/gpio.h>
diff --git a/drivers/media/video/smiapp/smiapp-debug.h b/drivers/media/video/smiapp/smiapp-debug.h
deleted file mode 100644
index 627809eed1d9..000000000000
--- a/drivers/media/video/smiapp/smiapp-debug.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/*
2 * drivers/media/video/smiapp/smiapp-debug.h
3 *
4 * Generic driver for SMIA/SMIA++ compliant camera modules
5 *
6 * Copyright (C) 2011--2012 Nokia Corporation
7 * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
8 *
9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License
11 * version 2 as published by the Free Software Foundation.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
21 * 02110-1301 USA
22 *
23 */
24
25#ifndef SMIAPP_DEBUG_H
26#define SMIAPP_DEBUG_H
27
28#ifdef CONFIG_VIDEO_SMIAPP_DEBUG
29#define DEBUG
30#endif
31
32#endif
diff --git a/drivers/media/video/smiapp/smiapp-quirk.c b/drivers/media/video/smiapp/smiapp-quirk.c
index dae85a12f7ec..fb018de4bfa8 100644
--- a/drivers/media/video/smiapp/smiapp-quirk.c
+++ b/drivers/media/video/smiapp/smiapp-quirk.c
@@ -22,8 +22,6 @@
22 * 22 *
23 */ 23 */
24 24
25#include "smiapp-debug.h"
26
27#include <linux/delay.h> 25#include <linux/delay.h>
28 26
29#include "smiapp.h" 27#include "smiapp.h"
diff --git a/drivers/media/video/smiapp/smiapp-regs.c b/drivers/media/video/smiapp/smiapp-regs.c
index 4851ff710779..a5055f18091f 100644
--- a/drivers/media/video/smiapp/smiapp-regs.c
+++ b/drivers/media/video/smiapp/smiapp-regs.c
@@ -22,8 +22,6 @@
22 * 22 *
23 */ 23 */
24 24
25#include "smiapp-debug.h"
26
27#include <linux/delay.h> 25#include <linux/delay.h>
28#include <linux/i2c.h> 26#include <linux/i2c.h>
29 27