Merge git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / thuban.h

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 8c37d7cace8c7eef28d14416651addeb267745db..23f4dbfe46661986cc66e9a73e9a18896ad08d9d 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -37,14 +37,10 @@
 #define EEPROM_ADDR_CHIP 0x120
 
 #undef CONFIG_MII
-#undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND    0x2E0000
 #define CONFIG_ENV_SIZE_REDUND      0x2000