projects
/
deliverable
/
linux.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/penberg...
[deliverable/linux.git]
/
drivers
/
video
/
cyber2000fb.c
diff --git
a/drivers/video/cyber2000fb.c
b/drivers/video/cyber2000fb.c
index d0e4cb618269b7c44c5c920def6e3bbc49e807f6..41d62632dcdb06bfc4b62f3266bb0ad6e8bda7ca 100644
(file)
--- a/
drivers/video/cyber2000fb.c
+++ b/
drivers/video/cyber2000fb.c
@@
-1425,7
+1425,7
@@
static void cyberpro_common_resume(struct cfb_info *cfb)
#ifdef CONFIG_ARCH_SHARK
-#include <
asm/ar
ch/hardware.h>
+#include <
ma
ch/hardware.h>
static int __devinit cyberpro_vl_probe(void)
{
This page took
0.024604 seconds
and
5
git commands to generate.