Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Conflicts:
	projects/ATV/linux/linux.i386.conf
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Generic/linux/linux.i386.conf
	projects/Generic_OSS/linux/linux.i386.conf
	projects/ION/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/Intel/linux/linux.i386.conf
	projects/Intel/linux/linux.x86_64.conf
	projects/Ultra/linux/linux.x86_64.conf
	projects/Virtual/linux/linux.i386.conf
	projects/Virtual/linux/linux.x86_64.conf

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="b616053"
+PKG_VERSION="f20e9d7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux-drivers/vboxguest/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vboxguest"
-PKG_VERSION="4.1.18"
+PKG_VERSION="4.2.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/linux-3.5.2-071-silence_i915_agp-module-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c	2011-04-27 05:48:50.000000000 +0200
-+++ linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c	2011-04-29 02:51:28.773622809 +0200
-@@ -760,7 +760,7 @@
- static int __init i915_init(void)
- {
- 	if (!intel_agp_enabled) {
--		DRM_ERROR("drm/i915 can't work without intel_agp module!\n");
-+		DRM_INFO("drm/i915 can't work without intel_agp module!\n");
- 		return -ENODEV;
- 	}
- 

packages/linux/patches/linux-3.5.2-212-mantis_stb0899_faster_lock.patch

@@ -1,141 +0,0 @@
-diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
-index 2da55ec..3efde1e 100644
---- a/drivers/media/dvb/frontends/stb0899_algo.c
-+++ b/drivers/media/dvb/frontends/stb0899_algo.c
-@@ -206,7 +206,6 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state)
- static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
- {
- 	struct stb0899_internal *internal = &state->internal;
--	struct stb0899_params *params = &state->params;
- 
- 	short int derot_step, derot_freq = 0, derot_limit, next_loop = 3;
- 	int index = 0;
-@@ -216,10 +215,9 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
- 
- 	/* timing loop computation & symbol rate optimisation	*/
- 	derot_limit = (internal->sub_range / 2L) / internal->mclk;
--	derot_step = (params->srate / 2L) / internal->mclk;
-+	derot_step = internal->derot_step * 4;				/* dertot_step = decreasing delta */
- 
- 	while ((stb0899_check_tmg(state) != TIMINGOK) && next_loop) {
--		index++;
- 		derot_freq += index * internal->direction * derot_step;	/* next derot zig zag position	*/
- 
- 		if (abs(derot_freq) > derot_limit)
-@@ -230,6 +228,7 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
- 			STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
- 			stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency		*/
- 		}
-+		index++;
- 		internal->direction = -internal->direction;	/* Change zigzag direction		*/
- 	}
- 
-@@ -278,14 +277,18 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
- {
- 	struct stb0899_internal *internal = &state->internal;
- 
--	short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3;
-+	short int derot_freq = 0, last_derot_freq = 0, derot_limit, derot_step, next_loop = 3;
- 	int index = 0;
-+	int base_freq;
- 	u8 cfr[2];
- 	u8 reg;
- 
- 	internal->status = NOCARRIER;
- 	derot_limit = (internal->sub_range / 2L) / internal->mclk;
- 	derot_freq = internal->derot_freq;
-+	derot_step = internal->derot_step * 2;
-+	last_derot_freq = internal->derot_freq;
-+	base_freq = internal->derot_freq;
- 
- 	reg = stb0899_read_reg(state, STB0899_CFD);
- 	STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
-@@ -294,11 +297,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
- 	do {
- 		dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk);
- 		if (stb0899_check_carrier(state) == NOCARRIER) {
--			index++;
- 			last_derot_freq = derot_freq;
--			derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */
-+			derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position	*/
- 
--			if(abs(derot_freq) > derot_limit)
-+			if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
- 				next_loop--;
- 
- 			if (next_loop) {
-@@ -310,9 +312,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
- 				STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
- 				stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency	*/
- 			}
-+			index++;
-+			internal->direction = -internal->direction; /* Change zigzag direction */
- 		}
- 
--		internal->direction = -internal->direction; /* Change zigzag direction */
- 	} while ((internal->status != CARRIEROK) && next_loop);
- 
- 	if (internal->status == CARRIEROK) {
-@@ -338,6 +341,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state)
- 	int lock = 0, index = 0, dataTime = 500, loop;
- 	u8 reg;
- 
-+	msleep(1);
- 	internal->status = NODATA;
- 
- 	/* RESET FEC	*/
-@@ -348,6 +352,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state)
- 	reg = stb0899_read_reg(state, STB0899_TSTRES);
- 	STB0899_SETFIELD_VAL(FRESACS, reg, 0);
- 	stb0899_write_reg(state, STB0899_TSTRES, reg);
-+	msleep(1);
- 
- 	if (params->srate <= 2000000)
- 		dataTime = 2000;
-@@ -360,6 +365,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state)
- 
- 	stb0899_write_reg(state, STB0899_DSTATUS2, 0x00); /* force search loop	*/
- 	while (1) {
-+		msleep(1); 		// Alex: added 1 mSec
- 		/* WARNING! VIT LOCKED has to be tested before VIT_END_LOOOP	*/
- 		reg = stb0899_read_reg(state, STB0899_VSTATUS);
- 		lock = STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg);
-@@ -387,20 +393,21 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state)
- 	short int derot_freq, derot_step, derot_limit, next_loop = 3;
- 	u8 cfr[2];
- 	u8 reg;
--	int index = 1;
-+	int index = 0;
-+	int base_freq;
- 
- 	struct stb0899_internal *internal = &state->internal;
--	struct stb0899_params *params = &state->params;
- 
--	derot_step = (params->srate / 4L) / internal->mclk;
-+	derot_step = internal->derot_step;
- 	derot_limit = (internal->sub_range / 2L) / internal->mclk;
- 	derot_freq = internal->derot_freq;
-+	base_freq = internal->derot_freq;
- 
- 	do {
- 		if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) {
- 
- 			derot_freq += index * internal->direction * derot_step;	/* next zig zag derotator position */
--			if (abs(derot_freq) > derot_limit)
-+			if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
- 				next_loop--;
- 
- 			if (next_loop) {
-@@ -414,9 +421,9 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state)
- 				stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency	*/
- 
- 				stb0899_check_carrier(state);
--				index++;
- 			}
- 		}
-+		index++;
- 		internal->direction = -internal->direction; /* change zig zag direction */
- 	} while ((internal->status != DATAOK) && next_loop);
- 
--- 
-1.7.1

packages/mediacenter/xbmc-frodo-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-PKG_VERSION="f196cd1"
+PKG_VERSION="ba2c709"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="f196cd1"
+PKG_VERSION="ba2c709"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-ba2c709-901-CEC_add_2548-1002.patch

@@ -0,0 +1,25 @@
+From 35c9bf5bd0f9d03541280df8d7b9af0bf6ffb1a4 Mon Sep 17 00:00:00 2001
+From: Lars Op den Kamp <lars@opdenkamp.eu>
+Date: Wed, 29 Aug 2012 13:43:55 +0200
+Subject: [PATCH] cec: also match 2548:1002 to the cec adapter
+
+---
+ system/peripherals.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/system/peripherals.xml b/system/peripherals.xml
+index cf0c6c4..76a1df9 100644
+--- a/system/peripherals.xml
++++ b/system/peripherals.xml
+@@ -9,7 +9,7 @@
+     <setting key="key_power" value="XBMC.ShutDown()" label="13015" order="6" />
+   </peripheral>
+ 
+-  <peripheral vendor_product="2548:1001" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
++  <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
+     <setting key="enabled" type="bool" value="1" label="305" order="1" />
+     <setting key="activate_source" type="bool" value="1" label="36020" order="2" />
+     <setting key="wake_devices" type="string" value="0" label="36007" order="3" />
+-- 
+1.7.10
+

packages/mediacenter/xbmc/patches/xbmc-11.0.2-999.061-CEC_add_2548-1002.patch

@@ -0,0 +1,12 @@
+diff -Naur xbmc-pvr-11.0.2/system/peripherals.xml xbmc-pvr-11.0.2.patch/system/peripherals.xml
+--- xbmc-pvr-11.0.2/system/peripherals.xml	2012-07-05 21:04:48.000000000 +0200
++++ xbmc-pvr-11.0.2.patch/system/peripherals.xml	2012-09-17 23:54:58.559892913 +0200
+@@ -8,7 +8,7 @@
+     <setting key="key_user" value="" label="36004" />
+   </peripheral>
+ 
+-  <peripheral vendor_product="2548:1001" bus="usb" name="Pulse-Eight CEC Adaptor" mapTo="cec">
++  <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adaptor" mapTo="cec">
+     <setting key="enabled" type="bool" value="1" label="305" />
+     <setting key="port" type="string" value="" label="792" />
+     <setting key="cec_hdmi_port" type="int" value="1" min="1" max="16" label="36015" />

packages/sysutils/open-vm-tools/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="open-vm-tools"
-PKG_VERSION="2012.03.13-651368"
+PKG_VERSION="2012.05.21-724730"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://open-vm-tools.sourceforge.net"
-PKG_URL="$SOURCEFORGE_SRC/project/open-vm-tools/open-vm-tools/2012.03.13/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="$SOURCEFORGE_SRC/project/open-vm-tools/open-vm-tools/2012.05.21/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain glib"
 PKG_PRIORITY="optional"

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="b616053"
+PKG_VERSION="f20e9d7"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

projects/ATV/linux/linux.i386.conf

@@ -1549,6 +1549,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/Fusion/linux/linux.i386.conf

@@ -1729,6 +1729,7 @@ CONFIG_SENSORS_FAM15H_POWER=y
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1737,6 +1738,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

projects/Fusion/linux/linux.x86_64.conf

@@ -1679,6 +1679,7 @@ CONFIG_SENSORS_FAM15H_POWER=y
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1687,6 +1688,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

projects/Generic/linux/linux.i386.conf

@@ -1815,6 +1815,7 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1823,6 +1824,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

projects/Generic_OSS/linux/linux.i386.conf

@@ -1813,6 +1813,7 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1821,6 +1822,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

projects/ION/linux/linux.i386.conf

@@ -1717,6 +1717,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1725,6 +1726,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/ION/linux/linux.x86_64.conf

@@ -1653,6 +1653,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1661,6 +1662,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/Intel/linux/linux.i386.conf

@@ -1755,6 +1755,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1763,6 +1764,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/Intel/linux/linux.x86_64.conf

@@ -1692,6 +1692,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1700,6 +1701,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/RPi/linux/linux.arm.conf

@@ -1281,7 +1281,7 @@ CONFIG_VIDEO_MT9V011=m
 #
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_AU0828 is not set
+CONFIG_VIDEO_AU0828=m
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_USB_VIDEO_CLASS is not set
@@ -1293,12 +1293,14 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 # CONFIG_VIDEO_HDPVR is not set
 CONFIG_VIDEO_EM28XX=m
-# CONFIG_VIDEO_EM28XX_ALSA is not set
+CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX_RC=y
 # CONFIG_VIDEO_TLG2300 is not set
 # CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_TM6000 is not set
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 # CONFIG_VIDEO_USBVISION is not set
 # CONFIG_USB_ET61X251 is not set
 # CONFIG_USB_SN9C102 is not set
@@ -1342,7 +1344,7 @@ CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_CINERGY_T2=m
 CONFIG_DVB_USB_ANYSEE=m
-# CONFIG_DVB_USB_DTV5100 is not set
+CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m
 # CONFIG_DVB_USB_CE6230 is not set
 # CONFIG_DVB_USB_FRIIO is not set
@@ -1435,6 +1437,7 @@ CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
 CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
 CONFIG_DVB_S5H1411=m
 
 #

projects/RPi/options

@@ -81,7 +81,7 @@
   esac
 
 # Build optimizations (size/normal/speed)
-  OPTIMIZATIONS="fast"
+  OPTIMIZATIONS="speed"
 
 # Project CFLAGS
   PROJECT_CFLAGS=""

projects/Ultra/linux/linux.x86_64.conf

@@ -1205,7 +1205,12 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RTL8192SE is not set
 # CONFIG_RTL8192DE is not set
 # CONFIG_RTL8192CU is not set
+<<<<<<< HEAD
 # CONFIG_WL_TI is not set
+=======
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX_MENU is not set
+>>>>>>> 33a760fb26aa731be79a8f5b9878165be1abc5d5
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 # CONFIG_MWIFIEX is not set
@@ -1577,6 +1582,7 @@ CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1585,6 +1591,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/Virtual/linux/linux.i386.conf

@@ -1761,6 +1761,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1769,6 +1770,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 

projects/Virtual/linux/linux.x86_64.conf

@@ -1697,6 +1697,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_W83627HF is not set
 CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_BCM2835 is not set
 
 #
 # ACPI drivers
@@ -1705,6 +1706,7 @@ CONFIG_SENSORS_W83627EHF=y
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_BCM2835 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y