diff --git a/[refs] b/[refs] index 920a3f7e6318..b1a3942b5e5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a62e90308f7b6965310cf4ec61393aef6861f50d +refs/heads/master: d91a8910d9585950706536a643ece51b67c695ec diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 79251a9cfb6f..8e6672acb9c9 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -766,6 +766,8 @@ source "arch/arm/plat-pxa/Kconfig" source "arch/arm/mach-mmp/Kconfig" +source "arch/arm/mach-nuc93x/Kconfig" + source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/plat-omap/Kconfig" @@ -837,8 +839,6 @@ source "arch/arm/mach-u300/Kconfig" source "arch/arm/mach-w90x900/Kconfig" -source "arch/arm/mach-nuc93x/Kconfig" - source "arch/arm/mach-bcmring/Kconfig" source "arch/arm/mach-ux500/Kconfig"