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/52xx/pcm030_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/52xx/pcm030_defconfig')
| -rw-r--r-- | arch/powerpc/configs/52xx/pcm030_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 9d0207783d60..b21b8e8c3a78 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig | |||
| @@ -740,8 +740,8 @@ CONFIG_I2C_MPC=y | |||
| 740 | # Miscellaneous I2C Chip support | 740 | # Miscellaneous I2C Chip support |
| 741 | # | 741 | # |
| 742 | # CONFIG_DS1682 is not set | 742 | # CONFIG_DS1682 is not set |
| 743 | # CONFIG_AT24 is not set | 743 | # CONFIG_EEPROM_AT24 is not set |
| 744 | CONFIG_SENSORS_EEPROM=m | 744 | CONFIG_EEPROM_LEGACY=m |
| 745 | # CONFIG_SENSORS_PCF8574 is not set | 745 | # CONFIG_SENSORS_PCF8574 is not set |
| 746 | # CONFIG_PCF8575 is not set | 746 | # CONFIG_PCF8575 is not set |
| 747 | # CONFIG_SENSORS_PCA9539 is not set | 747 | # CONFIG_SENSORS_PCA9539 is not set |