bttv-cards.c AUDC_CONFIG_PINNACLE fix

This fixes bug #162 on http://bugme.osdl.org that has still not been merged with mainline since it appeared in 2.5.51. This patch gets rid of the undeclared AUDC_CONFIG_PINNACLE problem. Please merge.

Steven Barnhart
[email protected]

It seems I totally forgot to attach the patch (sorry!). Its attached now.

Steven

--------
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.956 -> 1.957
# drivers/media/video/audiochip.h 1.1 -> 1.2
# drivers/media/video/Makefile 1.13 -> 1.14
# drivers/media/video/bttv-cards.c 1.12 -> 1.13
# (new) -> 1.1 drivers/media/video/tda9887.c
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29 [email protected] 1.957
# Fix AUDC_CONFIG_PINNACLE undeclared error in drivers/media/video/bttv-cards.c. # --------------------------------------------
#

diff -Nru a/drivers/media/video/Makefile b/drivers/media/video/Makefile
@@ -15,7 +15,7 @@
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
-	tda7432.o tda9875.o tuner.o video-buf.o
+	tda7432.o tda9875.o tuner.o video-buf.o tda9887.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o

diff -Nru a/drivers/media/video/audiochip.h b/drivers/media/video/audiochip.h
@@ -67,4 +67,8 @@
 #define AUDC_SWITCH_MUTE      _IO('m',16)      /* turn on mute */
 #endif
 
+
+/* misc stuff to pass around config info to i2c chips */
+#define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
+
 #endif /* AUDIOCHIP_H */

diff -Nru a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
@@ -40,6 +40,7 @@
 #if 0
 # include "bt832.h"
 #endif
+#include "audiochip.h"
 
 /* fwd decl */
 static void boot_msp34xx(struct bttv *btv, int pin);

It seems I totally forgot to attach the patch (sorry!). Its attached now.

Steven

--------
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.956 -> 1.957
# drivers/media/video/audiochip.h 1.1 -> 1.2
# drivers/media/video/Makefile 1.13 -> 1.14
# drivers/media/video/bttv-cards.c 1.12 -> 1.13
# (new) -> 1.1 drivers/media/video/tda9887.c
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29 [email protected] 1.957
# Fix AUDC_CONFIG_PINNACLE undeclared error in drivers/media/video/bttv-cards.c. # --------------------------------------------
#

diff -Nru a/drivers/media/video/Makefile b/drivers/media/video/Makefile
@@ -15,7 +15,7 @@
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
-	tda7432.o tda9875.o tuner.o video-buf.o
+	tda7432.o tda9875.o tuner.o video-buf.o tda9887.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o

diff -Nru a/drivers/media/video/audiochip.h b/drivers/media/video/audiochip.h
@@ -67,4 +67,8 @@
 #define AUDC_SWITCH_MUTE      _IO('m',16)      /* turn on mute */
 #endif
 
+
+/* misc stuff to pass around config info to i2c chips */
+#define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
+
 #endif /* AUDIOCHIP_H */

diff -Nru a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
@@ -40,6 +40,7 @@
 #if 0
 # include "bt832.h"
 #endif
+#include "audiochip.h"
 
 /* fwd decl */
 static void boot_msp34xx(struct bttv *btv, int pin);

omfg guys I am extremely sorry I am so not using Pan anymore!

Steven