Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334167
b: refs/heads/master
c: f2f0945
h: refs/heads/master
i:
  334165: a0e2c3a
  334163: 918acd1
  334159: 338a82c
v: v3
  • Loading branch information
Arnd Bergmann authored and Jason Wessel committed Oct 12, 2012
1 parent 7568d86 commit 645ec22
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 17b572e82032bc246324ce136696656b66d4e3f1
refs/heads/master: f2f0945e356daef87cdb01c0302801fb11cf382a
10 changes: 8 additions & 2 deletions trunk/include/linux/console.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,14 @@ void give_up_console(const struct consw *sw);
int con_debug_enter(struct vc_data *vc);
int con_debug_leave(void);
#else
#define con_debug_enter(vc) (0)
#define con_debug_leave() (0)
static inline int con_debug_enter(struct vc_data *vc)
{
return 0;
}
static inline int con_debug_leave(void)
{
return 0;
}
#endif

/* scroll */
Expand Down

0 comments on commit 645ec22

Please sign in to comment.