diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /arch/powerpc/platforms/pseries/Kconfig | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/platforms/pseries/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 5d1b743dbe7..5b3da4b4ea7 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -10,7 +10,7 @@ config PPC_PSERIES | |||
| 10 | select RTAS_ERROR_LOGGING | 10 | select RTAS_ERROR_LOGGING |
| 11 | select PPC_UDBG_16550 | 11 | select PPC_UDBG_16550 |
| 12 | select PPC_NATIVE | 12 | select PPC_NATIVE |
| 13 | select PPC_PCI_CHOICE if EMBEDDED | 13 | select PPC_PCI_CHOICE if EXPERT |
| 14 | default y | 14 | default y |
| 15 | 15 | ||
| 16 | config PPC_SPLPAR | 16 | config PPC_SPLPAR |
| @@ -24,9 +24,9 @@ config PPC_SPLPAR | |||
| 24 | two or more partitions. | 24 | two or more partitions. |
| 25 | 25 | ||
| 26 | config EEH | 26 | config EEH |
| 27 | bool "PCI Extended Error Handling (EEH)" if EMBEDDED | 27 | bool "PCI Extended Error Handling (EEH)" if EXPERT |
| 28 | depends on PPC_PSERIES && PCI | 28 | depends on PPC_PSERIES && PCI |
| 29 | default y if !EMBEDDED | 29 | default y if !EXPERT |
| 30 | 30 | ||
| 31 | config PSERIES_MSI | 31 | config PSERIES_MSI |
| 32 | bool | 32 | bool |