diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/tty/vt/keyboard.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/tty/vt/keyboard.c')
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 6dd3c68c13ad..d6b342b5b423 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
| @@ -600,7 +600,7 @@ static void fn_scroll_back(struct vc_data *vc) | |||
| 600 | 600 | ||
| 601 | static void fn_show_mem(struct vc_data *vc) | 601 | static void fn_show_mem(struct vc_data *vc) |
| 602 | { | 602 | { |
| 603 | show_mem(); | 603 | show_mem(0); |
| 604 | } | 604 | } |
| 605 | 605 | ||
| 606 | static void fn_show_state(struct vc_data *vc) | 606 | static void fn_show_state(struct vc_data *vc) |