aboutsummaryrefslogtreecommitdiff
path: root/Documentation/DocBook/device-drivers.tmpl
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-13 01:02:18 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-13 01:02:18 +0100
commit9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch)
tree569b5a13b3f7030a603460d8d9ded035a6f7f48f /Documentation/DocBook/device-drivers.tmpl
parent897493504addc5609f04a2c4f73c37ab972c29b2 (diff)
parent49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff)
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'Documentation/DocBook/device-drivers.tmpl')
-rw-r--r--Documentation/DocBook/device-drivers.tmpl1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index ecd35e9d441..feca0758391 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -46,7 +46,6 @@
<sect1><title>Atomic and pointer manipulation</title>
!Iarch/x86/include/asm/atomic.h
-!Iarch/x86/include/asm/unaligned.h
</sect1>
<sect1><title>Delaying, scheduling, and timer routines</title>