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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
drivers
/
video
/
vermilion
/
vermilion.h
diff --git
a/drivers/video/vermilion/vermilion.h
b/drivers/video/vermilion/vermilion.h
index
7491abf
..
43d11ec
100644
(file)
--- a/
drivers/video/vermilion/vermilion.h
+++ b/
drivers/video/vermilion/vermilion.h
@@
-31,7
+31,7
@@
#include <linux/kernel.h>
#include <linux/pci.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <linux/mutex.h>
#define VML_DEVICE_GPU 0x5002