diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /drivers/video/i810/Makefile | |
| parent | Input: HIDDEV - make HIDIOCSREPORT wait IO completion (diff) | |
| parent | [PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff) | |
| download | linux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip | |
Manual merge with Linus
Diffstat (limited to 'drivers/video/i810/Makefile')
| -rw-r--r-- | drivers/video/i810/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/i810/Makefile b/drivers/video/i810/Makefile index 794ae76c7c4b..96e08c8ded97 100644 --- 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 |