git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
Documentation
/
DocBook
/
kernel-api.tmpl
diff --git
a/Documentation/DocBook/kernel-api.tmpl
b/Documentation/DocBook/kernel-api.tmpl
index
230cbf7
..
aa38cc5
100644
(file)
--- a/
Documentation/DocBook/kernel-api.tmpl
+++ b/
Documentation/DocBook/kernel-api.tmpl
@@
-46,7
+46,7
@@
<sect1><title>Atomic and pointer manipulation</title>
!Iinclude/asm-x86/atomic_32.h
<sect1><title>Atomic and pointer manipulation</title>
!Iinclude/asm-x86/atomic_32.h
-!Iinclude/asm-x86/unaligned
_32
.h
+!Iinclude/asm-x86/unaligned.h
</sect1>
<sect1><title>Delaying, scheduling, and timer routines</title>
</sect1>
<sect1><title>Delaying, scheduling, and timer routines</title>
@@
-340,7
+340,7
@@
X!Earch/x86/kernel/mca_32.c
<chapter id="security">
<title>Security Framework</title>
<chapter id="security">
<title>Security Framework</title>
-!
E
security/security.c
+!
I
security/security.c
</chapter>
<chapter id="audit">
</chapter>
<chapter id="audit">
@@
-386,8
+386,7
@@
X!Edrivers/base/interface.c
!Edrivers/base/bus.c
</sect1>
<sect1><title>Device Drivers Power Management</title>
!Edrivers/base/bus.c
</sect1>
<sect1><title>Device Drivers Power Management</title>
-!Edrivers/base/power/resume.c
-!Edrivers/base/power/suspend.c
+!Edrivers/base/power/main.c
</sect1>
<sect1><title>Device Drivers ACPI Support</title>
<!-- Internal functions only
</sect1>
<sect1><title>Device Drivers ACPI Support</title>
<!-- Internal functions only