Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

CONTRIBUTING.md

@@ -10,15 +10,14 @@ If you are at all unsure whether it's a bug in OpenELEC or a problem with someth
 else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
 can always bee opend later.
 
-If you are sure that it's a bug in OpenELEC, open a new [issue] and try to
-answer the following questions:
-
+If you are sure that it's a bug in OpenELEC and you have not found a similar issue, open a new [issue]
+and try to answer the following questions:
 - What did you do?
 - What did you expect to happen?
 - What happened instead?
 
-Please also search for similar issues. It's possible somebody has encountered this already. 
-It is always good to provide the zip file found in the logfiles samba share.
+It is also importent to provide logs for debugging.
+A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.
 
 Make sure to specify which version of OpenELEC you are using.
 - OpenELEC version
@@ -47,3 +46,4 @@ particular feature into OpenELEC.
 [Forum]: http://openelec.tv/forum
 [issue]: https://github.com/OpenELEC/OpenELEC.tv/issues
 [webchat]: http://openelec.tv/support/chat
+[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs

packages/3rdparty/multimedia/vdr-plugin-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="935a294"
+PKG_VERSION="33afe59"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py

@@ -69,7 +69,7 @@ if sabNzbdLaunch:
 
     # start checking SABnzbd for activity and prevent sleeping if necessary
     socket.setdefaulttimeout(timeout)
-    
+
     # perform some initial checks and log essential settings
     shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
     wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
@@ -118,10 +118,8 @@ while (not xbmc.abortRequested):
                 # reset idle timer if queue is downloading/reparing/verifying/extracting
                 if sabIsActive:
                     xbmc.executebuiltin('InhibitIdleShutdown(true)')
-                    xbmc.log('preventing sleep')
                 else:
                     xbmc.executebuiltin('InhibitIdleShutdown(false)')
-                    xbmc.log('not preventing sleep')
 
         # calculate and set the time to wake up at (if any)
         if wakePeriodically:

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,9 +1,10 @@
-3.0.7 (in progress)
+3.0.7
 - update to vdr-plugin-xmltv2vdr-30903cc0
 - cleanup epgsources handling
 - * support for multiple epgsources
 - * support user defined epgsources
 - fixed epgsearch plugin not working without streamdev-server
+- vdr-addon: update to vdr-plugin-xvdr-33afe59
 
 3.0.6
 - fix startup error in vnsiserver / 32bit

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.0"
-PKG_REV="6"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/linux-drivers/linux-tbs-drivers/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux-tbs-drivers"
-PKG_VERSION="130429"
+PKG_VERSION="130506"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-firmware/wlan-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.11"
+PKG_VERSION="0.0.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/meta

@@ -35,7 +35,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
+PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER dvb-fe-tool"
 PKG_BUILD_DEPENDS="toolchain cpio module-init-tools pciutils xz"
 PKG_PRIORITY="optional"
 PKG_SECTION="linux"

packages/network/connman/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1aa44c8"
+PKG_VERSION="76c47b9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/connman/patches/connman-disable-wispr.patch

@@ -0,0 +1,167 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4b1b6c2..d518d5d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -172,6 +172,7 @@ endif
+ endif
+ 
+ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
++				@WISPR_CFLAGS@ \
+ 				@GNUTLS_CFLAGS@ $(builtin_cflags) \
+ 				-DCONNMAN_PLUGIN_BUILTIN \
+ 				-DSTATEDIR=\""$(statedir)"\" \
+diff --git a/configure.ac b/configure.ac
+index cff8b47..626137a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,13 +357,17 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+ if (test "${enable_wispr}" != "no"); then
+ 	PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
+ 				AC_MSG_ERROR(GnuTLS library is required))
++	WISPR_CFLAGS="-DENABLE_WISPR"
+ else
+ 	GNUTLS_CFLAGS=""
+ 	GNUTLS_LIBS=""
++	WISPR_CFLAGS=""
+ fi
+ AC_SUBST(GNUTLS_CFLAGS)
+ AC_SUBST(GNUTLS_LIBS)
+ 
++AC_SUBST(WISPR_CFLAGS)
++
+ if (test "${enable_loopback}" != "no"); then
+ 	AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
+ 			AC_MSG_ERROR(inotify header files are required))
+diff --git a/src/main.c b/src/main.c
+index 0d58fc4..9c3b79e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -689,7 +689,9 @@ int main(int argc, char *argv[])
+ 	__connman_dhcp_init();
+ 	__connman_dhcpv6_init();
+ 	__connman_wpad_init();
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_init();
++#endif
+ 	__connman_rfkill_init();
+ 
+ 	g_free(option_config);
+@@ -703,7 +705,9 @@ int main(int argc, char *argv[])
+ 	g_source_remove(signal);
+ 
+ 	__connman_rfkill_cleanup();
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_cleanup();
++#endif
+ 	__connman_wpad_cleanup();
+ 	__connman_dhcpv6_cleanup();
+ 	__connman_dhcp_cleanup();
+diff --git a/src/service.c b/src/service.c
+index bba548e..39ffda2 100644
+--- a/src/service.c
++++ b/src/service.c
+@@ -3155,6 +3155,7 @@ static DBusMessage *set_property(DBusConnection *conn,
+ 		update_nameservers(service);
+ 		dns_configuration_changed(service);
+ 
++#ifdef ENABLE_WISPR
+ 		if (__connman_service_is_connected_state(service,
+ 						CONNMAN_IPCONFIG_TYPE_IPV4))
+ 			__connman_wispr_start(service,
+@@ -3164,6 +3165,7 @@ static DBusMessage *set_property(DBusConnection *conn,
+ 						CONNMAN_IPCONFIG_TYPE_IPV6))
+ 			__connman_wispr_start(service,
+ 						CONNMAN_IPCONFIG_TYPE_IPV6);
++#endif
+ 
+ 		service_save(service);
+ 	} else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) {
+@@ -4272,7 +4274,9 @@ static void service_free(gpointer user_data)
+ 	__connman_notifier_service_remove(service);
+ 	service_schedule_removed(service);
+ 
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_stop(service);
++#endif
+ 	stats_stop(service);
+ 
+ 	service->path = NULL;
+@@ -5236,8 +5240,9 @@ static int service_indicate_state(struct connman_service *service)
+ 
+ 		default_changed();
+ 
++#ifdef ENABLE_WISPR
+ 		__connman_wispr_stop(service);
+-
++#endif
+ 		__connman_wpad_stop(service);
+ 
+ 		update_nameservers(service);
+@@ -5386,7 +5391,11 @@ static void check_proxy_setup(struct connman_service *service)
+ 	return;
+ 
+ done:
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
++#else
++	return;
++#endif
+ }
+ 
+ /*
+@@ -5448,7 +5457,9 @@ static gboolean redo_wispr(gpointer user_data)
+ 
+ 	DBG("");
+ 
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6);
++#endif
+ 
+ 	return FALSE;
+ }
+@@ -5474,7 +5485,9 @@ int __connman_service_online_check_failed(struct connman_service *service,
+ 	 * necessary IPv6 router advertisement messages that might have
+ 	 * DNS data etc.
+ 	 */
++#ifdef ENABLE_WISPR
+ 	g_timeout_add_seconds(1, redo_wispr, service);
++#endif
+ 
+ 	return EAGAIN;
+ }
+@@ -5529,7 +5542,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
+ 			service_rp_filter(service, TRUE);
+ 		} else {
+ 			service->online_check_count = 1;
++#ifdef ENABLE_WISPR
+ 			__connman_wispr_start(service, type);
++#endif
+ 		}
+ 		break;
+ 	case CONNMAN_SERVICE_STATE_ONLINE:
+diff --git a/src/wpad.c b/src/wpad.c
+index 4e5834e..8be310f 100644
+--- a/src/wpad.c
++++ b/src/wpad.c
+@@ -85,8 +85,10 @@ static void wpad_result(GResolvResultStatus status,
+ 
+ 		g_free(url);
+ 
++#ifdef ENABLE_WISPR
+ 		__connman_wispr_start(wpad->service,
+ 					CONNMAN_IPCONFIG_TYPE_IPV4);
++#endif
+ 
+ 		return;
+ 	}
+@@ -117,8 +119,10 @@ failed:
+ 	connman_service_set_proxy_method(wpad->service,
+ 				CONNMAN_SERVICE_PROXY_METHOD_DIRECT);
+ 
++#ifdef ENABLE_WISPR
+ 	__connman_wispr_start(wpad->service,
+ 					CONNMAN_IPCONFIG_TYPE_IPV4);
++#endif
+ }
+ 
+ int __connman_wpad_start(struct connman_service *service)

packages/sysutils/dvb-fe-tool/build

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+CWD=`pwd`
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-nls \
+            --disable-rpath \
+            --disable-libdvbv5 \
+            --disable-libv4l \
+            --disable-v4l-utils \
+            --disable-qv4l2 \
+            --without-libiconv-prefix \
+            --without-libintl-prefix \
+
+cd $CWD/$PKG_BUILD/lib
+  make CFLAGS="$TARGET_CFLAGS"
+
+cd $CWD/$PKG_BUILD/utils/dvb
+  make CFLAGS="$TARGET_CFLAGS"

packages/sysutils/dvb-fe-tool/install

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/utils/dvb/dvb-fe-tool $INSTALL/usr/bin

packages/sysutils/dvb-fe-tool/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  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, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="dvb-fe-tool"
+PKG_VERSION="0.9.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://linuxtv.org/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="dvb-fe-tool: Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
+PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/sysutils/open-vm-tools/build

@@ -22,6 +22,8 @@
 
 . config/options $1
 
+KERNEL_VER=$(basename $(ls -d $ROOT/$BUILD/linux-[0-9]*)| sed 's|linux-||g')
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -29,6 +31,8 @@ cd $PKG_BUILD
             --sysconfdir=/etc \
             --enable-shared \
             --disable-static \
+            --disable-docs \
+            --disable-tests \
             --without-pam \
             --without-gtk2 \
             --without-gtkmm \
@@ -36,6 +40,7 @@ cd $PKG_BUILD
             --without-x \
             --without-icu \
             --without-procps \
+            --with-kernel-release=$KERNEL_VER \
             --with-linuxdir=$(kernel_path)
 
 make CFLAGS+="-DG_DISABLE_DEPRECATED"

packages/sysutils/open-vm-tools/init.d/92_open-vm-tools

@@ -32,11 +32,7 @@
 
   # load modules
   modprobe vmhgfs
-  modprobe vmsync
-  modprobe vmblock
-  modprobe -r pcnet32
   modprobe vmxnet
-  modprobe pcnet32
 
   /usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid
 )&

packages/sysutils/open-vm-tools/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="open-vm-tools"
-PKG_VERSION="9.2.2-893683"
+PKG_VERSION="9.2.3-1031360"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -32,6 +32,5 @@ PKG_PRIORITY="optional"
 PKG_SECTION="virtualization"
 PKG_SHORTDESC="open-vm-tools: open source implementation of VMware Tools"
 PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools"
-
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-kernel-3.6.patch

@@ -1,44 +0,0 @@
-diff --git a/modules/linux/vmhgfs/inode.c b/modules/linux/vmhgfs/inode.c
-index 8d6cfbb..3642171 100644
---- a/modules/linux/vmhgfs/inode.c
-+++ b/modules/linux/vmhgfs/inode.c
-@@ -1852,7 +1852,7 @@ HgfsPermission(struct inode *inode,
- #else
-    if (mask & MAY_ACCESS) { /* For sys_access. */
- #endif
--      struct list_head *pos;
-+      struct hlist_node *pos;
-       int dcount = 0;
-       struct dentry *dentry = NULL;
- 
-@@ -1872,7 +1872,7 @@ HgfsPermission(struct inode *inode,
- #endif
- 
-       /* Find a dentry with valid d_count. Refer bug 587879. */
--      list_for_each(pos, &inode->i_dentry) {
-+      list_for_each(pos, inode->i_dentry.first) {
-          dentry = list_entry(pos, struct dentry, d_alias);
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
-          dcount = atomic_read(&dentry->d_count);
-diff --git a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
-index d05ccad..dff7fb5 100644
---- a/modules/linux/vmsync/sync.c
-+++ b/modules/linux/vmsync/sync.c
-@@ -162,7 +162,7 @@ VmSyncThawDevices(void  *_state)  // IN
-    cancel_delayed_work(&state->thawTask);
-    list_for_each_safe(cur, tmp, &state->devices) {
-       dev = list_entry(cur, VmSyncBlockDevice, list);
--      if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
-+      if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
-          thaw_bdev(dev->bdev, dev->sb);
-          atomic_dec(&gFreezeCount);
-       }
-@@ -237,7 +237,7 @@ VmSyncAddPath(const VmSyncState *state,   // IN
-     * the superblock is already frozen.
-     */
-    if (inode->i_sb->s_bdev == NULL ||
--       inode->i_sb->s_frozen != SB_UNFROZEN) {
-+       inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
-       result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
-       compat_path_release(&nd);
-       goto exit;

packages/sysutils/open-vm-tools/patches/open-vm-tools-9.2.2-893683-linux-3.8.patch

@@ -1,60 +0,0 @@
---- open-vm-tools-2012.05.21-724730/modules/linux/vmci/linux/driver.c~	2012-05-22 22:12:52.000000000 +0200
-+++ open-vm-tools-2012.05.21-724730/modules/linux/vmci/linux/driver.c	2013-02-21 01:22:04.836684885 +0100
-@@ -128,7 +128,11 @@ static struct pci_driver vmci_driver = {
-    .name     = VMCI_DEVICE_NAME,
-    .id_table = vmci_ids,
-    .probe = vmci_probe_device,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-    .remove = __devexit_p(vmci_remove_device),
-+#else
-+   .remove = vmci_remove_device,
-+#endif
- };
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-@@ -1747,7 +1751,10 @@ vmci_enable_msix(struct pci_dev *pdev) /
-  *-----------------------------------------------------------------------------
-  */
- 
--static int __devinit
-+static int
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+__devinit
-+#endif
- vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
-                   const struct pci_device_id *id) // IN: matching device ID
- {
-@@ -1975,7 +1982,10 @@ vmci_probe_device(struct pci_dev *pdev,
-  *-----------------------------------------------------------------------------
-  */
- 
--static void __devexit
-+static void
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+__devexit
-+#endif
- vmci_remove_device(struct pci_dev* pdev)
- {
-    struct vmci_device *dev = pci_get_drvdata(pdev);
---- open-vm-tools-2012.05.21-724730/modules/linux/shared/compat_mm.h	2013-01-17 17:58:53.090333002 +0100
-+++ open-vm-tools-2012.05.21-724730/modules/linux/shared/compat_mm.h	2013-01-17 18:18:25.274280444 +0100
-@@ -99,8 +99,18 @@ static inline struct page * alloc_pages(
-    vmtruncate(inode, size);                                                   \
-    result;                                                                    \
- })
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- #define compat_vmtruncate(inode, size) vmtruncate(inode, size)
-+#else
-+#define compat_vmtruncate(inode, size)                                        \
-+({                                                                            \
-+   result = inode_newsize_ok(inode, size);                                    \
-+   if (!result)                                                               \
-+   {                                                                          \
-+      truncate_setsize(inode, size);                                          \
-+   }                                                                          \
-+   result;                                                                    \
-+})
- #endif
- 
- 

projects/ARCTIC_MC/linux/linux.x86_64.conf

@@ -1250,7 +1250,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2152,6 +2152,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/ATV/linux/linux.i386.conf

@@ -2056,6 +2056,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Fusion/linux/linux.i386.conf

@@ -1318,7 +1318,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2352,6 +2352,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Fusion/linux/linux.x86_64.conf

@@ -1280,7 +1280,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2308,6 +2308,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Generic/linux/linux.i386.conf

@@ -2435,6 +2435,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Generic/linux/linux.x86_64.conf

@@ -2394,6 +2394,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Generic_OSS/linux/linux.i386.conf

@@ -2433,6 +2433,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/ION/linux/linux.i386.conf

@@ -1325,7 +1325,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2361,6 +2361,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/ION/linux/linux.x86_64.conf

@@ -1269,7 +1269,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2299,6 +2299,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Intel/linux/linux.i386.conf

@@ -1335,7 +1335,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2379,6 +2379,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Intel/linux/linux.x86_64.conf

@@ -1280,7 +1280,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2318,6 +2318,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/RPi/linux/linux.arm.conf

@@ -915,7 +915,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_WLAN=y
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_AT76C50X_USB is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y

projects/Ultra/linux/linux.x86_64.conf

@@ -1247,7 +1247,7 @@ CONFIG_WLAN=y
 # CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_PRISM54 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_RTL8180 is not set
 CONFIG_RTL8187=m
@@ -2134,6 +2134,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Virtual/linux/linux.i386.conf

@@ -2435,6 +2435,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m

projects/Virtual/linux/linux.x86_64.conf

@@ -2394,6 +2394,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_M88DC2800=m
+CONFIG_DVB_SIT2=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m