From 618c8fc1f32bc3b2b9420f5a794c889832f1a0a2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 8 Aug 2006 09:10:00 -0300
Subject: [PATCH] --- yaml --- r: 37311 b: refs/heads/master c:
 b59b36db9e8f441868c9907d6ea8fe0cdcb77f39 h: refs/heads/master i:   37309:
 af6dbb580305c86216b4fffe4c972b3712631a3d   37307:
 f84cf32fa2cc009da9455753530cf4e2d389c496   37303:
 144da9f38ef5bdb136a9f2f111b7fe7724a05f9d   37295:
 2d33257a41b5d6726d40f8897f399df2c58fab69   37279:
 6224c0e002da725a6df42ea48d9f53fc54eabdb0   37247:
 bf03a47915ead33639d2212f5c33cdef49cfe90c v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/media/radio/radio-aimslab.c                | 1 -
 trunk/drivers/media/radio/radio-aztech.c                 | 1 -
 trunk/drivers/media/radio/radio-gemtek.c                 | 1 -
 trunk/drivers/media/radio/radio-rtrack2.c                | 1 -
 trunk/drivers/media/radio/radio-terratec.c               | 1 -
 trunk/drivers/media/radio/radio-trust.c                  | 1 -
 trunk/drivers/media/radio/radio-typhoon.c                | 1 -
 trunk/drivers/media/radio/radio-zoltrix.c                | 1 -
 trunk/drivers/media/video/cx88/cx88-tvaudio.c            | 1 -
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 1 -
 trunk/drivers/media/video/pvrusb2/pvrusb2-main.c         | 1 -
 trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c        | 1 -
 13 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4429bb092b3e..f223dab5c5f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c591947b044513bcc42dd57ea61f41b5b462d93
+refs/heads/master: b59b36db9e8f441868c9907d6ea8fe0cdcb77f39
diff --git a/trunk/drivers/media/radio/radio-aimslab.c b/trunk/drivers/media/radio/radio-aimslab.c
index df22a582e7a2..5a9c1f14e353 100644
--- a/trunk/drivers/media/radio/radio-aimslab.c
+++ b/trunk/drivers/media/radio/radio-aimslab.c
@@ -35,7 +35,6 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_RTRACK_PORT 	*/
 #include <asm/semaphore.h>	/* Lock for the I/O 		*/
 
 #ifndef CONFIG_RADIO_RTRACK_PORT
diff --git a/trunk/drivers/media/radio/radio-aztech.c b/trunk/drivers/media/radio/radio-aztech.c
index 95e6322133ee..63697ab517f9 100644
--- a/trunk/drivers/media/radio/radio-aztech.c
+++ b/trunk/drivers/media/radio/radio-aztech.c
@@ -32,7 +32,6 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_AZTECH_PORT 	*/
 
 /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
 
diff --git a/trunk/drivers/media/radio/radio-gemtek.c b/trunk/drivers/media/radio/radio-gemtek.c
index 162f37d8bf96..ffabe02406b5 100644
--- a/trunk/drivers/media/radio/radio-gemtek.c
+++ b/trunk/drivers/media/radio/radio-gemtek.c
@@ -23,7 +23,6 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_GEMTEK_PORT 	*/
 #include <linux/spinlock.h>
 
 #ifndef CONFIG_RADIO_GEMTEK_PORT
diff --git a/trunk/drivers/media/radio/radio-rtrack2.c b/trunk/drivers/media/radio/radio-rtrack2.c
index 5b68ac4c7322..e5e9d41e4bd0 100644
--- a/trunk/drivers/media/radio/radio-rtrack2.c
+++ b/trunk/drivers/media/radio/radio-rtrack2.c
@@ -16,7 +16,6 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_RTRACK2_PORT 	*/
 #include <linux/spinlock.h>
 
 #ifndef CONFIG_RADIO_RTRACK2_PORT
diff --git a/trunk/drivers/media/radio/radio-terratec.c b/trunk/drivers/media/radio/radio-terratec.c
index dfba4ae596cd..72d82ca6af6e 100644
--- a/trunk/drivers/media/radio/radio-terratec.c
+++ b/trunk/drivers/media/radio/radio-terratec.c
@@ -31,7 +31,6 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_TERRATEC_PORT 	*/
 #include <linux/spinlock.h>
 
 #ifndef CONFIG_RADIO_TERRATEC_PORT
diff --git a/trunk/drivers/media/radio/radio-trust.c b/trunk/drivers/media/radio/radio-trust.c
index 8da4badc22b4..696fae8dace0 100644
--- a/trunk/drivers/media/radio/radio-trust.c
+++ b/trunk/drivers/media/radio/radio-trust.c
@@ -23,7 +23,6 @@
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_TRUST_PORT 	*/
 
 /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
 
diff --git a/trunk/drivers/media/radio/radio-typhoon.c b/trunk/drivers/media/radio/radio-typhoon.c
index edd012288669..2835c8947f0a 100644
--- a/trunk/drivers/media/radio/radio-typhoon.c
+++ b/trunk/drivers/media/radio/radio-typhoon.c
@@ -37,7 +37,6 @@
 #include <asm/uaccess.h>	/* copy to/from user              */
 #include <linux/videodev.h>	/* kernel radio structs           */
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_TYPHOON_*         */
 
 #define BANNER "Typhoon Radio Card driver v0.1\n"
 
diff --git a/trunk/drivers/media/radio/radio-zoltrix.c b/trunk/drivers/media/radio/radio-zoltrix.c
index 59b86a6b4b0e..432c3e2222d0 100644
--- a/trunk/drivers/media/radio/radio-zoltrix.c
+++ b/trunk/drivers/media/radio/radio-zoltrix.c
@@ -34,7 +34,6 @@
 #include <asm/uaccess.h>	/* copy to/from user              */
 #include <linux/videodev.h>	/* kernel radio structs           */
 #include <media/v4l2-common.h>
-#include <linux/config.h>	/* CONFIG_RADIO_ZOLTRIX_PORT      */
 
 #ifndef CONFIG_RADIO_ZOLTRIX_PORT
 #define CONFIG_RADIO_ZOLTRIX_PORT -1
diff --git a/trunk/drivers/media/video/cx88/cx88-tvaudio.c b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
index 5785c3481579..cbd85feec922 100644
--- a/trunk/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
@@ -52,7 +52,6 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/delay.h>
-#include <linux/config.h>
 #include <linux/kthread.h>
 
 #include "cx88.h"
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 0d6dc33ca320..0bc85c8fb8d6 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -33,7 +33,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-main.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-main.c
index 8f1a5afdd34e..e976c484c058 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index d1dda5caf406..38e9222dc7dc 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <asm/semaphore.h>