diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 16:14:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 16:14:19 -0500 |
| commit | ad4a4a82d176962ea706db555b29821af0b4dd45 (patch) | |
| tree | f7b9c8dc86fc9de64211c7cc4af911e9e2e08bf9 /drivers/s390/block/xpram.c | |
| parent | 6277d53a9ff34ecd3837690b243aa8c8c993898d (diff) | |
| parent | 0c2bd9b24e73287aa4ee87844c847205e0da8a9b (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] tape: deadlock on system work queue
[S390] keyboard: integer underflow bug
[S390] xpram: remove __initdata attribute from module parameters
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; | |||
| 62 | /* | 62 | /* |
| 63 | * Parameter parsing functions. | 63 | * Parameter parsing functions. |
| 64 | */ | 64 | */ |
| 65 | static int __initdata devs = XPRAM_DEVS; | 65 | static int devs = XPRAM_DEVS; |
| 66 | static char __initdata *sizes[XPRAM_MAX_DEVS]; | 66 | static char *sizes[XPRAM_MAX_DEVS]; |
| 67 | 67 | ||
| 68 | module_param(devs, int, 0); | 68 | module_param(devs, int, 0); |
| 69 | module_param_array(sizes, charp, NULL, 0); | 69 | module_param_array(sizes, charp, NULL, 0); |