diff --git a/[refs] b/[refs] index 1871b968020d..1badd83ef4bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d6951439ef524683057251f1231df232046b6b6 +refs/heads/master: 3d1e8a81cc81e62d13731e48c40760e60f31b0d5 diff --git a/trunk/arch/tile/Kconfig b/trunk/arch/tile/Kconfig index 30413c1d1069..30393aa500ec 100644 --- a/trunk/arch/tile/Kconfig +++ b/trunk/arch/tile/Kconfig @@ -69,6 +69,9 @@ config ARCH_PHYS_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT def_bool y +config NEED_DMA_MAP_STATE + def_bool y + config LOCKDEP_SUPPORT def_bool y @@ -118,7 +121,7 @@ config 64BIT config ARCH_DEFCONFIG string - default "arch/tile/configs/tile_defconfig" if !TILEGX + default "arch/tile/configs/tilepro_defconfig" if !TILEGX default "arch/tile/configs/tilegx_defconfig" if TILEGX source "init/Kconfig"