diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-12 21:19:32 -0700 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:57:21 +0200 |
| commit | 417f381c4568212275f0244500d7d5e1cdb5f99f (patch) | |
| tree | a56d7b281e2ed665fc395e4724611b115a64881b /arch/powerpc/platforms/pseries/Kconfig | |
| parent | 87c35c56f4beed9e43bd41427643215655a31c3d (diff) | |
| parent | c8241085e8606a14ef48e6d99556133c48aaddaf (diff) | |
| download | kernel_goldelico_gta04-417f381c4568212275f0244500d7d5e1cdb5f99f.zip kernel_goldelico_gta04-417f381c4568212275f0244500d7d5e1cdb5f99f.tar.gz kernel_goldelico_gta04-417f381c4568212275f0244500d7d5e1cdb5f99f.tar.bz2 | |
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s
ARM: mach-shmobile: clock-r8a7740: add MMCIF clock
ARM: mach-shmobile: clock-r8a7740: add SDHI clock
ARM: mach-shmobile: clock-r8a7740: add USB clock
ARM: mach-shmobile: clock-r8a7740: add FSI clock
ARM: mach-shmobile: r8a7740: cleanup I2C workaround method
ARM: mach-shmobile: r8a7740: add gpio_irq support
ARM: mach-shmobile: sh7372: Add FSI DMAEngine support
ARM / mach-shmobile: Use preset_lpj with calibrate_delay()
+ renesas fixes and v3.4-rc6
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/platforms/pseries/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index aadbe4f..178a5f3 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -30,9 +30,9 @@ config PPC_SPLPAR two or more partitions. config EEH - bool "PCI Extended Error Handling (EEH)" if EXPERT + bool depends on PPC_PSERIES && PCI - default y if !EXPERT + default y config PSERIES_MSI bool |