diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /drivers/gpu/drm/nouveau/Makefile | |
parent | regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps (diff) | |
parent | Linux 3.13-rc4 (diff) | |
download | linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.tar.xz linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.zip |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'drivers/gpu/drm/nouveau/Makefile')
-rw-r--r-- | drivers/gpu/drm/nouveau/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index edcf801613e6..b3fa1ba191b7 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile @@ -59,6 +59,7 @@ nouveau-y += core/subdev/clock/nv40.o nouveau-y += core/subdev/clock/nv50.o nouveau-y += core/subdev/clock/nv84.o nouveau-y += core/subdev/clock/nva3.o +nouveau-y += core/subdev/clock/nvaa.o nouveau-y += core/subdev/clock/nvc0.o nouveau-y += core/subdev/clock/nve0.o nouveau-y += core/subdev/clock/pllnv04.o |