diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/powerpc/configs/ppc64_defconfig | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index d4685d1c0be8..88c6295b76c1 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -1261,8 +1261,8 @@ CONFIG_I2C_PASEMI=y | |||
| 1261 | # Miscellaneous I2C Chip support | 1261 | # Miscellaneous I2C Chip support |
| 1262 | # | 1262 | # |
| 1263 | # CONFIG_DS1682 is not set | 1263 | # CONFIG_DS1682 is not set |
| 1264 | # CONFIG_AT24 is not set | 1264 | # CONFIG_EEPROM_AT24 is not set |
| 1265 | # CONFIG_SENSORS_EEPROM is not set | 1265 | # CONFIG_EEPROM_LEGACY is not set |
| 1266 | # CONFIG_SENSORS_PCF8574 is not set | 1266 | # CONFIG_SENSORS_PCF8574 is not set |
| 1267 | # CONFIG_PCF8575 is not set | 1267 | # CONFIG_PCF8575 is not set |
| 1268 | # CONFIG_SENSORS_PCA9539 is not set | 1268 | # CONFIG_SENSORS_PCA9539 is not set |