Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / apalis_t30.h

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 104c413..80204d7 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -20,11 +20,7 @@
  * Apalis UART3: NVIDIA UARTB
  * Apalis UART4: NVIDIA UARTC
  */
-#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
-
-/* PCI networking support */
-#define CONFIG_E1000_NO_NVM
+#define CFG_SYS_NS16550_COM1           NV_PA_APB_UARTA_BASE
 
 #define UBOOT_UPDATE \
        "uboot_hwpart=1\0" \