Messages in this thread | | | Date | Fri, 14 Oct 2011 14:31:42 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the mips tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in drivers/ide/Kconfig between commit a60891de4357 ("MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines") from the mips tree and commit 6af677ea59fb ("Kconfig: remove redundant CONFIG_ prefix on two symbols") from the trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ide/Kconfig index ff7c6bb,76b6d98..0000000 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@@ -681,8 -681,8 +681,8 @@@ config BLK_DEV_IDE_AU1XX select IDE_XFER_MODE choice prompt "IDE Mode for AMD Alchemy Au1200" - default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA + default BLK_DEV_IDE_AU1XXX_PIO_DBDMA - depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX + depends on BLK_DEV_IDE_AU1XXX config BLK_DEV_IDE_AU1XXX_PIO_DBDMA bool "PIO+DbDMA IDE for AMD Alchemy Au1200" [unhandled content-type:application/pgp-signature] | |