diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-28 12:09:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-28 12:09:42 +1000 |
| commit | f2205584161674531ba36ed3e5a23f698c23a641 (patch) | |
| tree | 73a8c25a318b64e1bfb67f0a54431a2fdf0cead6 /include | |
| parent | fee3c1d0e3f769001a0209050b12c117ab603a5b (diff) | |
| parent | b6750c4bf7b52a1e37c75a2d75a9bee6acae09dc (diff) | |
Merge remote branch 'kgdb/kgdb-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 3 | ||||
| -rw-r--r-- | include/linux/kbd_kern.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 59b7073b13fe..6a9f3935ea0b 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -61,7 +61,8 @@ struct drm_crtc_helper_funcs { int (*mode_set_base)(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb); int (*mode_set_base_atomic)(struct drm_crtc *crtc, - struct drm_framebuffer *fb, int x, int y); + struct drm_framebuffer *fb, int x, int y, + int is_enter); /* reload the current crtc LUT */ void (*load_lut)(struct drm_crtc *crtc); diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h index 506ad20c18f8..ae87c0ad4ce9 100644 --- a/include/linux/kbd_kern.h +++ b/include/linux/kbd_kern.h @@ -144,6 +144,7 @@ struct console; int getkeycode(unsigned int scancode); int setkeycode(unsigned int scancode, unsigned int keycode); void compute_shiftstate(void); +void kbd_dbg_clear_keys(void); /* defkeymap.c */ |