aruba fixes, work in progress

SVN-Revision: 7324

target/linux/aruba-2.6/config/default

@@ -167,7 +167,7 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_V2PCI is not set
+# CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

target/linux/aruba-2.6/files/drivers/char/watchdog/wdt_merlot.c

@@ -4,6 +4,8 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/fs.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

target/linux/generic-2.6/config-template

@@ -1343,6 +1343,7 @@ CONFIG_USB_EZUSB=y
 CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_KBTAB is not set
+# CONFIG_USB_KC2190 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
@@ -1356,6 +1357,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_NET1080=m
@@ -1380,6 +1382,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
+# CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m