diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-03-10 14:00:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 14:00:44 -0800 |
| commit | bef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch) | |
| tree | 1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /drivers/s390/block/xpram.c | |
| parent | net: bridge builtin vs. ipv6 modular (diff) | |
| parent | Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (diff) | |
| download | linux-dev-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.tar.xz linux-dev-bef6e7e76868ab454d5e83635a4a7a1961c74fb5.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/s390/block/xpram.c')
| -rw-r--r-- | drivers/s390/block/xpram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index c881a14fa5dd..1f6a4d894e73 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -62,8 +62,8 @@ static int xpram_devs; /* * Parameter parsing functions. */ -static int __initdata devs = XPRAM_DEVS; -static char __initdata *sizes[XPRAM_MAX_DEVS]; +static int devs = XPRAM_DEVS; +static char *sizes[XPRAM_MAX_DEVS]; module_param(devs, int, 0); module_param_array(sizes, charp, NULL, 0); |