Date: Saturday, March 24, 2012 @ 09:36:41 Author: tpowa Revision: 154233
disable W1 support in config Modified: linux/trunk/config linux/trunk/config.x86_64 ---------------+ config | 29 ++--------------------------- config.x86_64 | 27 +-------------------------- 2 files changed, 3 insertions(+), 53 deletions(-) Modified: config =================================================================== --- config 2012-03-24 13:21:16 UTC (rev 154232) +++ config 2012-03-24 13:36:41 UTC (rev 154233) @@ -3042,7 +3042,7 @@ # # PCI GPIO expanders: # -CONFIG_GPIO_CS5535=m +CONFIG_GPIO_CS5535=y CONFIG_GPIO_LANGWELL=y CONFIG_GPIO_PCH=m CONFIG_GPIO_ML_IOH=m @@ -3063,36 +3063,11 @@ # MODULbus GPIO expanders: # CONFIG_GPIO_JANZ_TTL=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_BQ27000=m +# CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m CONFIG_TEST_POWER=m -# CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2782 is not set CONFIG_BATTERY_OLPC=m Modified: config.x86_64 =================================================================== --- config.x86_64 2012-03-24 13:21:16 UTC (rev 154232) +++ config.x86_64 2012-03-24 13:36:41 UTC (rev 154233) @@ -2921,36 +2921,11 @@ # MODULbus GPIO expanders: # CONFIG_GPIO_JANZ_TTL=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_BQ27000=m +# CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m CONFIG_TEST_POWER=m -# CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_SBS is not set
