vserver 2.0 rc7

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

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index a1355ce..060b1f2 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -156,27 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY};
 
 static spinlock_t pf_spin_lock;
 
-#ifndef MODULE
-
-#include "setup.h"
-
-static STT pf_stt[7] = {
-       {"drive0", 7, drive0},
-       {"drive1", 7, drive1},
-       {"drive2", 7, drive2},
-       {"drive3", 7, drive3},
-       {"disable", 1, &disable},
-       {"cluster", 1, &cluster},
-       {"nice", 1, &nice}
-};
-
-void pf_setup(char *str, int *ints)
-{
-       generic_setup(pf_stt, 7, str);
-}
-
-#endif
-
 module_param(verbose, bool, 0644);
 module_param(major, int, 0);
 module_param(name, charp, 0);
@@ -256,7 +235,7 @@ struct pf_unit {
        struct gendisk *disk;
 };
 
-struct pf_unit units[PF_UNITS];
+static struct pf_unit units[PF_UNITS];
 
 static int pf_identify(struct pf_unit *pf);
 static void pf_lock(struct pf_unit *pf, int func);
@@ -290,7 +269,7 @@ static struct block_device_operations pf_fops = {
        .media_changed  = pf_check_media,
 };
 
-void pf_init_units(void)
+static void __init pf_init_units(void)
 {
        struct pf_unit *pf;
        int unit;