diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/powerpc/configs/85xx | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/powerpc/configs/85xx')
| -rw-r--r-- | arch/powerpc/configs/85xx/mpc8536_ds_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/mpc8568mds_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/stx_gp3_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/tqm8540_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/tqm8541_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/tqm8548_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/tqm8555_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/85xx/tqm8560_defconfig | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig index e243e14a6708..256055cb6d2f 100644 --- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig | |||
| @@ -849,8 +849,8 @@ CONFIG_I2C_MPC=y | |||
| 849 | # Miscellaneous I2C Chip support | 849 | # Miscellaneous I2C Chip support |
| 850 | # | 850 | # |
| 851 | # CONFIG_DS1682 is not set | 851 | # CONFIG_DS1682 is not set |
| 852 | # CONFIG_AT24 is not set | 852 | # CONFIG_EEPROM_AT24 is not set |
| 853 | CONFIG_SENSORS_EEPROM=y | 853 | CONFIG_EEPROM_LEGACY=y |
| 854 | # CONFIG_SENSORS_PCF8574 is not set | 854 | # CONFIG_SENSORS_PCF8574 is not set |
| 855 | # CONFIG_PCF8575 is not set | 855 | # CONFIG_PCF8575 is not set |
| 856 | # CONFIG_SENSORS_PCA9539 is not set | 856 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index f6cb01495ea6..5ac7e51e9f14 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig | |||
| @@ -848,8 +848,8 @@ CONFIG_I2C_MPC=y | |||
| 848 | # Miscellaneous I2C Chip support | 848 | # Miscellaneous I2C Chip support |
| 849 | # | 849 | # |
| 850 | # CONFIG_DS1682 is not set | 850 | # CONFIG_DS1682 is not set |
| 851 | # CONFIG_AT24 is not set | 851 | # CONFIG_EEPROM_AT24 is not set |
| 852 | CONFIG_SENSORS_EEPROM=y | 852 | CONFIG_EEPROM_LEGACY=y |
| 853 | # CONFIG_SENSORS_PCF8574 is not set | 853 | # CONFIG_SENSORS_PCF8574 is not set |
| 854 | # CONFIG_PCF8575 is not set | 854 | # CONFIG_PCF8575 is not set |
| 855 | # CONFIG_SENSORS_PCA9539 is not set | 855 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 597be8491812..ab5b0b58924c 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig | |||
| @@ -723,8 +723,8 @@ CONFIG_I2C_MPC=y | |||
| 723 | # Miscellaneous I2C Chip support | 723 | # Miscellaneous I2C Chip support |
| 724 | # | 724 | # |
| 725 | # CONFIG_DS1682 is not set | 725 | # CONFIG_DS1682 is not set |
| 726 | # CONFIG_AT24 is not set | 726 | # CONFIG_EEPROM_AT24 is not set |
| 727 | # CONFIG_SENSORS_EEPROM is not set | 727 | # CONFIG_EEPROM_LEGACY is not set |
| 728 | # CONFIG_SENSORS_PCF8574 is not set | 728 | # CONFIG_SENSORS_PCF8574 is not set |
| 729 | # CONFIG_PCF8575 is not set | 729 | # CONFIG_PCF8575 is not set |
| 730 | # CONFIG_SENSORS_PCA9539 is not set | 730 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 32aeb79216f7..65ef823e08c6 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig | |||
| @@ -861,8 +861,8 @@ CONFIG_I2C_MPC=y | |||
| 861 | # Miscellaneous I2C Chip support | 861 | # Miscellaneous I2C Chip support |
| 862 | # | 862 | # |
| 863 | # CONFIG_DS1682 is not set | 863 | # CONFIG_DS1682 is not set |
| 864 | # CONFIG_AT24 is not set | 864 | # CONFIG_EEPROM_AT24 is not set |
| 865 | CONFIG_SENSORS_EEPROM=y | 865 | CONFIG_EEPROM_LEGACY=y |
| 866 | # CONFIG_SENSORS_PCF8574 is not set | 866 | # CONFIG_SENSORS_PCF8574 is not set |
| 867 | # CONFIG_PCF8575 is not set | 867 | # CONFIG_PCF8575 is not set |
| 868 | # CONFIG_SENSORS_PCA9539 is not set | 868 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 5a0cf58d2b8c..f1288a0c3040 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig | |||
| @@ -877,8 +877,8 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 877 | # Miscellaneous I2C Chip support | 877 | # Miscellaneous I2C Chip support |
| 878 | # | 878 | # |
| 879 | # CONFIG_DS1682 is not set | 879 | # CONFIG_DS1682 is not set |
| 880 | # CONFIG_AT24 is not set | 880 | # CONFIG_EEPROM_AT24 is not set |
| 881 | # CONFIG_SENSORS_EEPROM is not set | 881 | # CONFIG_EEPROM_LEGACY is not set |
| 882 | # CONFIG_SENSORS_PCF8574 is not set | 882 | # CONFIG_SENSORS_PCF8574 is not set |
| 883 | # CONFIG_PCF8575 is not set | 883 | # CONFIG_PCF8575 is not set |
| 884 | # CONFIG_SENSORS_PCA9539 is not set | 884 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index f3e4f3481fda..b3b1de6a6a85 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_defconfig | |||
| @@ -787,8 +787,8 @@ CONFIG_I2C_MPC=y | |||
| 787 | # Miscellaneous I2C Chip support | 787 | # Miscellaneous I2C Chip support |
| 788 | # | 788 | # |
| 789 | # CONFIG_DS1682 is not set | 789 | # CONFIG_DS1682 is not set |
| 790 | # CONFIG_AT24 is not set | 790 | # CONFIG_EEPROM_AT24 is not set |
| 791 | # CONFIG_SENSORS_EEPROM is not set | 791 | # CONFIG_EEPROM_LEGACY is not set |
| 792 | # CONFIG_SENSORS_PCF8574 is not set | 792 | # CONFIG_SENSORS_PCF8574 is not set |
| 793 | # CONFIG_PCF8575 is not set | 793 | # CONFIG_PCF8575 is not set |
| 794 | # CONFIG_SENSORS_PCA9539 is not set | 794 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index c62489394535..a92a639cdf8a 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_defconfig | |||
| @@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y | |||
| 796 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| 797 | # | 797 | # |
| 798 | # CONFIG_DS1682 is not set | 798 | # CONFIG_DS1682 is not set |
| 799 | # CONFIG_AT24 is not set | 799 | # CONFIG_EEPROM_AT24 is not set |
| 800 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_EEPROM_LEGACY is not set |
| 801 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
| 802 | # CONFIG_PCF8575 is not set | 802 | # CONFIG_PCF8575 is not set |
| 803 | # CONFIG_SENSORS_PCA9539 is not set | 803 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig index eef45b97dc3e..397d37fbe7e3 100644 --- a/arch/powerpc/configs/85xx/tqm8548_defconfig +++ b/arch/powerpc/configs/85xx/tqm8548_defconfig | |||
| @@ -806,8 +806,8 @@ CONFIG_I2C_MPC=y | |||
| 806 | # Miscellaneous I2C Chip support | 806 | # Miscellaneous I2C Chip support |
| 807 | # | 807 | # |
| 808 | # CONFIG_DS1682 is not set | 808 | # CONFIG_DS1682 is not set |
| 809 | # CONFIG_AT24 is not set | 809 | # CONFIG_EEPROM_AT24 is not set |
| 810 | # CONFIG_SENSORS_EEPROM is not set | 810 | # CONFIG_EEPROM_LEGACY is not set |
| 811 | # CONFIG_SENSORS_PCF8574 is not set | 811 | # CONFIG_SENSORS_PCF8574 is not set |
| 812 | # CONFIG_PCF8575 is not set | 812 | # CONFIG_PCF8575 is not set |
| 813 | # CONFIG_SENSORS_PCA9539 is not set | 813 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index 11b637e99a54..856ca6ab37b7 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_defconfig | |||
| @@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y | |||
| 796 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| 797 | # | 797 | # |
| 798 | # CONFIG_DS1682 is not set | 798 | # CONFIG_DS1682 is not set |
| 799 | # CONFIG_AT24 is not set | 799 | # CONFIG_EEPROM_AT24 is not set |
| 800 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_EEPROM_LEGACY is not set |
| 801 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
| 802 | # CONFIG_PCF8575 is not set | 802 | # CONFIG_PCF8575 is not set |
| 803 | # CONFIG_SENSORS_PCA9539 is not set | 803 | # CONFIG_SENSORS_PCA9539 is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 2519169b6d4b..56ed4213609c 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_defconfig | |||
| @@ -796,8 +796,8 @@ CONFIG_I2C_MPC=y | |||
| 796 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| 797 | # | 797 | # |
| 798 | # CONFIG_DS1682 is not set | 798 | # CONFIG_DS1682 is not set |
| 799 | # CONFIG_AT24 is not set | 799 | # CONFIG_EEPROM_AT24 is not set |
| 800 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_EEPROM_LEGACY is not set |
| 801 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
| 802 | # CONFIG_PCF8575 is not set | 802 | # CONFIG_PCF8575 is not set |
| 803 | # CONFIG_SENSORS_PCA9539 is not set | 803 | # CONFIG_SENSORS_PCA9539 is not set |