vserver 2.0 rc7

[linux-2.6.git] / drivers / block / paride / pcd.c

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index c4d5378..7289f67 100644 (file)
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -142,26 +142,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 
 static spinlock_t pcd_lock;
 
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pcd_stt[6] = {
-       {"drive0", 6, drive0},
-       {"drive1", 6, drive1},
-       {"drive2", 6, drive2},
-       {"drive3", 6, drive3},
-       {"disable", 1, &disable},
-       {"nice", 1, &nice}
-};
-
-void pcd_setup(char *str, int *ints)
-{
-       generic_setup(pcd_stt, 6, str);
-}
-
-#endif
-
 module_param(verbose, bool, 0644);
 module_param(major, int, 0);
 module_param(name, charp, 0);
@@ -218,7 +198,7 @@ struct pcd_unit {
        struct gendisk *disk;
 };
 
-struct pcd_unit pcd[PCD_UNITS];
+static struct pcd_unit pcd[PCD_UNITS];
 
 static char pcd_scratch[64];
 static char pcd_buffer[2048];  /* raw block buffer */