Merge branch 'master' of ../work into next

[oweals/u-boot.git] / include / configs / actux4.h

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index f2b701f8f156181367be90154d067e99a89d0cf7..8d70a268ce54d38952b4a02e8f349ff40e167ee3 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -32,6 +32,7 @@
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE              IXP425_UART1
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTDELAY               3
@@ -82,8 +83,6 @@
 #define CONFIG_SYS_MEMTEST_START               0x00400000
 #define CONFIG_SYS_MEMTEST_END                 0x00800000
 
-/* everything, incl board info, in Hz */
-#undef  CONFIG_SYS_CLKS_IN_HZ
 /* spec says 66.666 MHz, but it appears to be 33 */
 #define CONFIG_SYS_HZ                          3333333