[PATCH] Make it possible to compile in the Bluetooth subsystem

..and minor() cleanups

net/bluetooth/af_bluetooth.c

@@ -356,11 +356,9 @@ static void __exit bluez_cleanup(void)
 	remove_proc_entry("bluetooth", NULL);
 }
 
-#ifdef MODULE
 module_init(bluez_init);
 module_exit(bluez_cleanup);
 
 MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");
 MODULE_DESCRIPTION("BlueZ Core ver " VERSION);
 MODULE_LICENSE("GPL");
-#endif

net/bluetooth/rfcomm/tty.c

@@ -501,12 +501,6 @@ static void rfcomm_tty_wakeup(unsigned long arg)
 #endif
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-#define __minor MINOR
-#else
-#define __minor minor
-#endif
-
 static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
 {
 	DECLARE_WAITQUEUE(wait, current);
@@ -514,7 +508,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
 	struct rfcomm_dlc *dlc;
 	int err, id;
 
-        id = __minor(tty->device) - tty->driver.minor_start;
+        id = minor(tty->device) - tty->driver.minor_start;
 
 	BT_DBG("tty %p id %d", tty, id);