diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/tty/vt/keyboard.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
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 6dd3c68c13a..d6b342b5b42 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) |