Merge branch 'upstream-merged'

1 files changed, 32 insertions, 0 deletions

diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
new file mode 100644
index 00000000..63ab182f
--- /dev/null
+++ b/dde_rtl8139/main.c
@@ -0,0 +1,32 @@
+#include <dde26.h> /* l4dde26_*() */
+#include <dde26_net.h> /* l4dde26 networking */
+
+#include <linux/netdevice.h> /* struct sk_buff */
+#include <linux/pci.h> /* pci_unregister_driver() */
+#include <linux/init.h>  // initcall()
+#include <linux/delay.h> // msleep()
+
+#include <machdev.h>
+
+int using_std = 1;
+
+int main(int argc, char **argv)
+{
+	l4dde26_init();
+	l4dde26_process_init();
+	l4dde26_softirq_init();
+
+	printk("Initializing skb subsystem\n");
+	skb_init();
+
+	l4dde26_do_initcalls();
+
+	register_net();
+	mach_device_init();
+	trivfs_init();
+
+	cthread_detach (cthread_fork (ds_server, NULL));
+	trivfs_server();
+
+	return 0;
+}