diff options
| author | Magnus Wendt <magnus.wendt@stericsson.com> | 2011-02-09 12:40:30 +0100 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:55:06 +0200 |
| commit | 7a362f40195528001f33f897c6ed54a39fbfd369 (patch) | |
| tree | dada17ae24da178fdb5dfc9e22f788141103307e /drivers/gpu/Makefile | |
| parent | 177945c364a3b71231a0d7904282502d9360d46c (diff) | |
drivers/gpu: Include mali through a symlink
The mali device driver is maintained in its own git and has been built
as a kernel module in the past. This commit adds a symlink in
drivers/gpu to the mali400ko git and modifies the Makefile and Kconfig
to include the mali driver in the kernel.
ST-Ericsson ID: CR283174
Change-Id: I7a35ee5c4463ac68f13dc2e45aa77ad18f8e5dc6
Signed-off-by: Magnus Wendt <magnus.wendt@stericsson.com>
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29943
Reviewed-by: Robert FEKETE <robert.fekete@stericsson.com>
Tested-by: Robert FEKETE <robert.fekete@stericsson.com>
Reviewed-by: Ushit KUMAR <ushit.kumar@stericsson.com>
Tested-by: Ushit KUMAR <ushit.kumar@stericsson.com>
Diffstat (limited to 'drivers/gpu/Makefile')
| -rw-r--r-- | drivers/gpu/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index cc9277885dd..4c2544fc920 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1 +1,8 @@ +<<<<<<< HEAD obj-y += drm/ vga/ stub/ +======= +obj-y += drm/ vga/ stub/ ion/ +ifeq ($(CONFIG_GPU_MALI), y) + obj-$(CONFIG_GPU_MALI) += mali/ +endif +>>>>>>> drivers/gpu: Include mali through a symlink |