From 6869dd252596204f967140146ff38b9eee78a644 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 10 Oct 2011 11:44:51 +0200 Subject: [PATCH] --- yaml --- r: 264843 b: refs/heads/master c: 6af677ea59fb62ae6b720a9e5e9d5cba32ada553 h: refs/heads/master i: 264841: c9f2e4d9f3f1bb3b87354181ff9bb0f2fd65bae9 264839: 7306beac63f4fd941028891fd00ba6e8dd83a7ee v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/Kconfig | 2 +- trunk/drivers/ide/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 45fa3be70100..867f6bdb4c70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0b5bf090bb47104ac78f463063933966c6ca00b +refs/heads/master: 6af677ea59fb62ae6b720a9e5e9d5cba32ada553 diff --git a/trunk/arch/powerpc/platforms/85xx/Kconfig b/trunk/arch/powerpc/platforms/85xx/Kconfig index 498534cd5265..12f5932dadc9 100644 --- a/trunk/arch/powerpc/platforms/85xx/Kconfig +++ b/trunk/arch/powerpc/platforms/85xx/Kconfig @@ -80,7 +80,7 @@ config P1010_RDB config P1022_DS bool "Freescale P1022 DS" select DEFAULT_UIMAGE - select CONFIG_PHYS_64BIT # The DTS has 36-bit addresses + select PHYS_64BIT # The DTS has 36-bit addresses select SWIOTLB help This option enables support for the Freescale P1022DS reference board. diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 811dbbd9306c..76b6d98bd295 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -681,7 +681,7 @@ config BLK_DEV_IDE_AU1XXX 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 config BLK_DEV_IDE_AU1XXX_PIO_DBDMA