diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 11:17:26 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 11:17:26 +0000 |
commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /drivers/video/via/Makefile | |
parent | 8727b909bb2348d29e62c599cd7a5d610da3760f (diff) | |
parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
download | kernel-crypto-f9b44121b34174ae4f243a568393fc3225842e75.tar.gz kernel-crypto-f9b44121b34174ae4f243a568393fc3225842e75.tar.xz kernel-crypto-f9b44121b34174ae4f243a568393fc3225842e75.zip |
Merge commit 'v2.6.34-rc2' into for-2.6.34
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 e533b4b6aba..eeed238ad6a 100644 --- a/drivers/video/via/Makefile +++ b/drivers/video/via/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_FB_VIA) += viafb.o -viafb-y :=viafbdev.o hw.o iface.o via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.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 tbl1636.o |