Merge bk://gkernel.bkbits.net/net-drivers-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/net/wireless/atmel_pci.c

@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/init.h>
 #include <linux/netdevice.h>
 
 MODULE_AUTHOR("Simon Kelley");