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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
apic.h
diff --git
a/arch/x86/include/asm/apic.h
b/arch/x86/include/asm/apic.h
index
4a0b7c7
..
7b3ca83
100644
(file)
--- a/
arch/x86/include/asm/apic.h
+++ b/
arch/x86/include/asm/apic.h
@@
-8,7
+8,7
@@
#include <asm/cpufeature.h>
#include <asm/processor.h>
#include <asm/apicdef.h>
#include <asm/cpufeature.h>
#include <asm/processor.h>
#include <asm/apicdef.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/fixmap.h>
#include <asm/mpspec.h>
#include <asm/system.h>
#include <asm/fixmap.h>
#include <asm/mpspec.h>
#include <asm/system.h>