Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-tegra20 / funcmux.h

diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h
index 258f7b641a62b8c3a090c022432235b1f8eafddf..c986b93b40a03ebacdb54f968d313f020038a3a9 100644 (file)
--- a/arch/arm/include/asm/arch-tegra20/funcmux.h
+++ b/arch/arm/include/asm/arch-tegra20/funcmux.h
@@ -57,6 +57,10 @@ enum {
 
        /* Serial Flash configs */
        FUNCMUX_SPI1_GMC_GMD = 0,
+
+       /* NAND flags */
+       FUNCMUX_NDFLASH_ATC = 0,
+       FUNCMUX_NDFLASH_KBC_8_BIT,
 };
 
 /**