diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 13:26:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 13:26:23 +1000 |
| commit | 7377900039da3fdd46f0b11b43a3cf8c61f94659 (patch) | |
| tree | fb6bcc6c2073fcb6651f99b9d3dc19cc02dcdc86 /Documentation | |
| parent | 1076f944ac5aa7cdaeaa7a5b62340881f0042213 (diff) | |
| parent | dd06ed72cc0b24a9081865f79a1c29a4be218a8b (diff) | |
Merge remote branch 'bkl-llseek/llseek'
Conflicts:
drivers/char/virtio_console.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 910c923a9b86..2861055afd7a 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -136,6 +136,7 @@ #ifdef CONFIG_COMPAT .compat_ioctl = i915_compat_ioctl, #endif + .llseek = noop_llseek, }, .pci_driver = { .name = DRIVER_NAME, |