vserver 1.9.5.x5

[linux-2.6.git] / drivers / cdrom / aztcd.c

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index b6a14c8..43bf1e5 100644 (file)
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -165,7 +165,6 @@
                         Torben Mathiasen <tmm@image.dk>
 */
 
-#include <linux/version.h>
 #include <linux/blkdev.h>
 #include "aztcd.h"
 
@@ -288,7 +287,7 @@ static volatile int azt_read_count = 1;
 
 static int azt_port = AZT_BASE_ADDR;
 
-MODULE_PARM(azt_port, "i");
+module_param(azt_port, int, 0);
 
 static int azt_port_auto[16] = AZT_BASE_AUTO;
 
@@ -312,7 +311,7 @@ static unsigned char aztIndatum;
 static unsigned long aztTimeOutCount;
 static int aztCmd = 0;
 
-static spinlock_t aztSpin = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(aztSpin);
 
 /*###########################################################################
    Function Prototypes
@@ -1708,8 +1707,8 @@ static int __init aztcd_init(void)
        printk(KERN_INFO "aztcd: (C) 1994-98 W.Zimmermann\n");
        if (azt_port == -1) {
                printk
-                   ("aztcd: KernelVersion=%s DriverVersion=%s For IDE/ATAPI-drives use ide-cd.c\n",
-                    UTS_RELEASE, AZT_VERSION);
+                   ("aztcd: DriverVersion=%s For IDE/ATAPI-drives use ide-cd.c\n",
+                    AZT_VERSION);
        } else
                printk
                    ("aztcd: DriverVersion=%s BaseAddress=0x%x  For IDE/ATAPI-drives use ide-cd.c\n",