Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits)
  V4L/DVB (10130): use USB API functions rather than constants
  V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
  V4L/DVB (10128): modify V4L documentation to be a valid XHTML
  V4L/DVB (10127): stv06xx: Avoid having y unitialized
  V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
  V4L/DVB (10124): em28xx: expand output formats available
  V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
  V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
  V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
  V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
  V4L/DVB (10119): em28xx: fix corrupted XCLK value
  V4L/DVB (10118): zoran: fix warning for a variable not used
  V4L/DVB (10116): af9013: Fix gcc false warnings
  V4L/DVB (10111a): usbvideo.h: remove an useless blank line
  V4L/DVB (10111): quickcam_messenger.c: fix a warning
  V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
  V4L/DVB (10109): anysee: Fix usage of an unitialized function
  V4L/DVB (10104): uvcvideo: Add support for video output devices
  V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
  V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
  ...

1 files changed, 115 insertions, 0 deletions

diff --git a/drivers/media/dvb/frontends/stb6100.h b/drivers/media/dvb/frontends/stb6100.h
new file mode 100644
index 000000000000..395d056599a6
--- /dev/null
+++ b/drivers/media/dvb/frontends/stb6100.h
@@ -0,0 +1,115 @@
+/*
+        STB6100 Silicon Tuner
+        Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+        Copyright (C) ST Microelectronics
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __STB_6100_REG_H
+#define __STB_6100_REG_H
+
+#include <linux/dvb/frontend.h>
+#include "dvb_frontend.h"
+
+#define STB6100_LD                      0x00
+#define STB6100_LD_LOCK                 (1 << 0)
+
+#define STB6100_VCO                     0x01
+#define STB6100_VCO_OSCH                (0x01 << 7)
+#define STB6100_VCO_OSCH_SHIFT          7
+#define STB6100_VCO_OCK                 (0x03 << 5)
+#define STB6100_VCO_OCK_SHIFT           5
+#define STB6100_VCO_ODIV                (0x01 << 4)
+#define STB6100_VCO_ODIV_SHIFT          4
+#define STB6100_VCO_OSM                 (0x0f << 0)
+
+#define STB6100_NI                      0x02
+#define STB6100_NF_LSB                  0x03
+
+#define STB6100_K                       0x04
+#define STB6100_K_PSD2                  (0x01 << 2)
+#define STB6100_K_PSD2_SHIFT            2
+#define STB6100_K_NF_MSB                (0x03 << 0)
+
+#define STB6100_G                       0x05
+#define STB6100_G_G                     (0x0f << 0)
+#define STB6100_G_GCT                   (0x07 << 5)
+
+#define STB6100_F                       0x06
+#define STB6100_F_F                     (0x1f << 0)
+
+#define STB6100_DLB                     0x07
+
+#define STB6100_TEST1                   0x08
+
+#define STB6100_FCCK                    0x09
+#define STB6100_FCCK_FCCK               (0x01 << 6)
+
+#define STB6100_LPEN                    0x0a
+#define STB6100_LPEN_LPEN               (0x01 << 4)
+#define STB6100_LPEN_SYNP               (0x01 << 5)
+#define STB6100_LPEN_OSCP               (0x01 << 6)
+#define STB6100_LPEN_BEN                (0x01 << 7)
+
+#define STB6100_TEST3                   0x0b
+
+#define STB6100_NUMREGS                 0x0c
+
+
+#define INRANGE(val, x, y)              (((x <= val) && (val <= y)) ||          \
+                                         ((y <= val) && (val <= x)) ? 1 : 0)
+
+#define CHKRANGE(val, x, y)             (((val >= x) && (val < y)) ? 1 : 0)
+
+struct stb6100_config {
+        u8      tuner_address;
+        u32     refclock;
+};
+
+struct stb6100_state {
+        struct i2c_adapter *i2c;
+
+        const struct stb6100_config     *config;
+        struct dvb_tuner_ops            ops;
+        struct dvb_frontend             *frontend;
+        struct tuner_state              status;
+
+        u32 frequency;
+        u32 srate;
+        u32 bandwidth;
+        u32 reference;
+};
+
+#if defined(CONFIG_DVB_STB6100) || (defined(CONFIG_DVB_STB6100_MODULE) && defined(MODULE))
+
+extern struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
+                                           struct stb6100_config *config,
+                                           struct i2c_adapter *i2c);
+
+#else
+
+static inline struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
+                                                  struct stb6100_config *config,
+                                                  struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+
+#endif //CONFIG_DVB_STB6100
+
+#endif