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 first four commits of 'zImage_fixes' of git://git.linaro.org/people/nico/linux...
[pandora-kernel.git]
/
drivers
/
video
/
i810
/
Makefile
diff --git
a/drivers/video/i810/Makefile
b/drivers/video/i810/Makefile
index
794ae76
..
96e08c8
100644
(file)
--- a/
drivers/video/i810/Makefile
+++ b/
drivers/video/i810/Makefile
@@
-4,7
+4,6
@@
obj-$(CONFIG_FB_I810) += i810fb.o
-
i810fb-objs := i810_main.o i810_accel.o
ifdef CONFIG_FB_I810_GTF
@@
-12,3
+11,7
@@
i810fb-objs += i810_gtf.o
else
i810fb-objs += i810_dvt.o
endif
+
+ifdef CONFIG_FB_I810_I2C
+i810fb-objs += i810-i2c.o
+endif