diff --git a/[refs] b/[refs] index 8897be113b4d..540eb483169b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c705677e1c69012adea3bc51b54e9c7170d1cbee +refs/heads/master: f5b2eb026949e7c3988074529854609921675cff diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index c04b7138e1a6..836caf1e9439 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -852,7 +852,6 @@ source "arch/powerpc/platforms/prep/Kconfig" config CMDLINE_BOOL bool "Default bootloader kernel arguments" - depends on !PPC_ISERIES config CMDLINE string "Initial kernel command string"