some cleanups

BasiliskII/src/Unix/Linux/NetDriver/Makefile

@@ -3,10 +3,11 @@
 ## System specific configuration
 CC = cc
 CPPFLAGS = -I. -I/usr/src/linux/include
-CFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE
+CFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES
 ASFLAGS =
 LDFLAGS =
 LIBS =
+KERNDIR = /lib/modules/$(shell uname -r)
 
 ## Files
 OBJS = sheep_net.o
@@ -19,8 +20,8 @@ dev:
 	mknod /dev/sheep_net c 10 198
 
 install: sheep_net.o
-	install -d /lib/modules/`uname -r`/misc
-	install -m 644 sheep_net.o /lib/modules/`uname -r`/misc
+	install -d $(KERNDIR)/misc
+	install -m 644 sheep_net.o $(KERNDIR)/misc
 
 clean:
 	-rm $(OBJS)

BasiliskII/src/Unix/Linux/NetDriver/sheep_net.c

@@ -18,29 +18,23 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
-#ifndef MODULE
-#define MODULE
-#endif
-
 /* determine whether to use checksummed versions of kernel symbols */
 #include <linux/config.h>
-#ifdef CONFIG_MODVERSIONS
+
+#if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #define MODVERSIONS
+#endif
+
+#if defined(MODVERSIONS)
 #include <linux/modversions.h>
 #endif
 
 /* modversions.h redefines kernel symbols.  Now include other headers */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/version.h>
+
+#include <linux/types.h>
 #include <linux/miscdevice.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>