diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
| commit | f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1 (patch) | |
| tree | 5074abce8a7cffd69519194c8b5b627de1099dca /drivers/video/via/Makefile | |
| parent | 75ec72f8c53b9f981e68704432a2e425a01f79b7 (diff) | |
| parent | 2946294f9aa734efc5873ea2f34131d0a8c0f89a (diff) | |
Merge branch 'viafb-pll' into viafb-next
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/Makefile')
| -rw-r--r-- | drivers/video/via/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile index 96f01ee2a412..5108136e8776 100644 --- a/drivers/video/via/Makefile +++ b/drivers/video/via/Makefile @@ -6,4 +6,4 @@ obj-$(CONFIG_FB_VIA) += viafb.o viafb-y :=viafbdev.o hw.o via_i2c.o dvi.o lcd.o ioctl.o accel.o \ via_utility.o vt1636.o global.o tblDPASetting.o viamode.o \ - via-core.o via-gpio.o via_modesetting.o + via-core.o via-gpio.o via_modesetting.o via_clock.o |