diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/s390/mm/cmm.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/mm/cmm.c')
| -rw-r--r-- | arch/s390/mm/cmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index 607f50ead1fd..f93a056869bc 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
| @@ -245,7 +245,7 @@ cmm_set_timeout(long nr, long seconds) | |||
| 245 | cmm_set_timer(); | 245 | cmm_set_timer(); |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | static inline int | 248 | static int |
| 249 | cmm_skip_blanks(char *cp, char **endp) | 249 | cmm_skip_blanks(char *cp, char **endp) |
| 250 | { | 250 | { |
| 251 | char *str; | 251 | char *str; |
| @@ -414,7 +414,7 @@ cmm_smsg_target(char *from, char *msg) | |||
| 414 | } | 414 | } |
| 415 | #endif | 415 | #endif |
| 416 | 416 | ||
| 417 | struct ctl_table_header *cmm_sysctl_header; | 417 | static struct ctl_table_header *cmm_sysctl_header; |
| 418 | 418 | ||
| 419 | static int | 419 | static int |
| 420 | cmm_init (void) | 420 | cmm_init (void) |