thermal: Fix merge error in Kconfig
Bo Yan [Sat, 29 Jun 2013 18:57:56 +0000 (11:57 -0700)]
Remove redundant entries
Re-generate tegra defconfigs, so THERMAL_DEFAULT_GOV_PID is not
enabled.

Change-Id: I90d4e9f4aa8a5690250dc5231ad1e98355f9bb82
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/243691
(cherry picked from commit 292191bfb89f285eb8e0d24ba59d08fcb540a0ae)
Reviewed-on: http://git-master/r/246174
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>

arch/arm/configs/tegra11_defconfig
arch/arm/configs/tegra12_android_defconfig
arch/arm/configs/tegra12_defconfig
arch/arm/configs/tegra_bonaire_mods_defconfig
arch/arm/configs/tegra_bonaire_sim_android_defconfig

index 31dbe5a..c9273ec 100644 (file)
@@ -240,8 +240,16 @@ CONFIG_BCM43241=y
 CONFIG_BCM43341=y
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram.txt"
+CONFIG_BCMDHD_CFG80211=y
 CONFIG_BCMDHD_HW_OOB=y
 CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
+CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
+CONFIG_BCM4335=m
+CONFIG_BCM4335_FW_PATH="/lib/firmware/fw_bcmdhd.bin"
+CONFIG_BCM4335_NVRAM_PATH="/lib/firmware/nvram.txt"
+CONFIG_BCM4335_WIFI_CONTROL_FUNC=y
+CONFIG_BCM4335_HW_OOB=y
+CONFIG_SD8797=m
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
@@ -287,6 +295,7 @@ CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_MAX77660=y
 CONFIG_POWER_SUPPLY_EXTCON=y
 CONFIG_TEST_POWER=y
+CONFIG_CHARGER_MAX77665=y
 CONFIG_BATTERY_SBS=y
 CONFIG_BATTERY_BQ27x00=y
 CONFIG_CHARGER_TPS8003X=y
@@ -341,6 +350,7 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_TEGRA_MEDIASERVER is not set
 CONFIG_TEGRA_NVAVP=y
index afd7899..b6b915f 100644 (file)
@@ -257,7 +257,6 @@ CONFIG_TOUCHSCREEN_SYN_RMI4_SPI=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_CAPELLA_CM3217=y
 CONFIG_INV_AK8975=m
 CONFIG_INV_MPU=m
 CONFIG_SERIO_LIBPS2=y
@@ -289,13 +288,12 @@ CONFIG_CHARGER_EXTCON_MAX77660=y
 CONFIG_SENSORS_INA219=y
 CONFIG_SENSORS_INA230=y
 CONFIG_SENSORS_INA3221=y
-CONFIG_THERMAL_DEFAULT_GOV_PID=y
+CONFIG_THERMAL_GOV_PID=y
 CONFIG_PWM_FAN=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_MAX77660_SYSTEM_WATCHDOG=y
-CONFIG_MFD_BQ2419X=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS80031=y
@@ -313,7 +311,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_BQ2419X=y
 CONFIG_REGULATOR_AS3722=y
 CONFIG_REGULATOR_MAX8973=y
 CONFIG_REGULATOR_MAX77663=y
index fad2b06..e0a7366 100644 (file)
@@ -255,7 +255,6 @@ CONFIG_TOUCHSCREEN_SYN_RMI4_SPI=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_CAPELLA_CM3217=y
 CONFIG_INV_AK8975=m
 CONFIG_INV_MPU=m
 CONFIG_SERIO_LIBPS2=y
@@ -287,13 +286,12 @@ CONFIG_CHARGER_EXTCON_MAX77660=y
 CONFIG_SENSORS_INA219=y
 CONFIG_SENSORS_INA230=y
 CONFIG_SENSORS_INA3221=y
-CONFIG_THERMAL_DEFAULT_GOV_PID=y
+CONFIG_THERMAL_GOV_PID=y
 CONFIG_PWM_FAN=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_MAX77660_SYSTEM_WATCHDOG=y
-CONFIG_MFD_BQ2419X=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS80031=y
@@ -311,7 +309,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_BQ2419X=y
 CONFIG_REGULATOR_AS3722=y
 CONFIG_REGULATOR_MAX8973=y
 CONFIG_REGULATOR_MAX77663=y
index 11e9ce5..53661df 100644 (file)
@@ -76,7 +76,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_I2C=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-CONFIG_THERMAL_DEFAULT_GOV_PID=y
+CONFIG_THERMAL_GOV_PID=y
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 # CONFIG_TEGRA_NVMAP is not set
index 6b4254a..68d4d2b 100644 (file)
@@ -32,6 +32,7 @@ CONFIG_MACH_BONAIRE=y
 CONFIG_TEGRA_SIMULATION_PLATFORM=y
 CONFIG_TEGRA_DEBUG_UARTA=y
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
+CONFIG_ARM_LPAE=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -42,7 +43,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE="mem=448@2048M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
-CONFIG_ARM_LPAE=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -86,16 +86,18 @@ CONFIG_SMSC911X=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_TEGRA_HS=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-CONFIG_THERMAL_DEFAULT_GOV_PID=y
+CONFIG_THERMAL_GOV_PID=y
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_DC=y
 CONFIG_TEGRA_GK20A_PMU=y
 CONFIG_TEGRA_GPU_CYCLE_STATS=y
+# CONFIG_TEGRA_CAMERA is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_SOUND=y
 CONFIG_SND=y
@@ -116,6 +118,8 @@ CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_TEGRA=y
+CONFIG_DMADEVICES=y
+CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STAGING=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
@@ -157,7 +161,3 @@ CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y
-CONFIG_SERIAL_TEGRA_HS=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_DMADEVICES=y
-CONFIG_TEGRA_CAMERA=n