diff options
| author | Tomi Valkeinen | 2012-11-16 10:42:46 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2012-11-16 10:42:46 +0100 |
| commit | dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 (patch) | |
| tree | fb198f6a52f4790ea2468a421fc8c91a3b3648c8 /drivers/video/omap2/Makefile | |
| parent | Merge tag 'v3.7-rc4' (diff) | |
| parent | OMAP: remove vram allocator (diff) | |
| download | kernel-qcow2-linux-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.tar.gz kernel-qcow2-linux-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.tar.xz kernel-qcow2-linux-dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8.zip | |
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/Kconfig
drivers/video/omap2/omapfb/omapfb-ioctl.c
drivers/video/omap2/omapfb/omapfb-main.c
Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.
Diffstat (limited to 'drivers/video/omap2/Makefile')
| -rw-r--r-- | drivers/video/omap2/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/omap2/Makefile b/drivers/video/omap2/Makefile index 5ddef129f798..5ea7cb9aed17 100644 --- a/drivers/video/omap2/Makefile +++ b/drivers/video/omap2/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_OMAP2_VRAM) += vram.o obj-$(CONFIG_OMAP2_VRFB) += vrfb.o obj-$(CONFIG_OMAP2_DSS) += dss/ |