diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
| commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
| tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /drivers/block/paride/pg.c | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
| parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'drivers/block/paride/pg.c')
| -rw-r--r-- | drivers/block/paride/pg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 2ce3dfd7e6b9..876d0c3eaf58 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -137,7 +137,7 @@ */ -static bool verbose = 0; +static int verbose; static int major = PG_MAJOR; static char *name = PG_NAME; static int disable = 0; @@ -168,7 +168,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY}; #include <asm/uaccess.h> -module_param(verbose, bool, 0644); +module_param(verbose, int, 0644); module_param(major, int, 0); module_param(name, charp, 0); module_param_array(drive0, int, NULL, 0); |