diff options
| author | Magnus Wendt <magnus.wendt@stericsson.com> | 2011-05-19 17:09:50 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:55:07 +0200 |
| commit | 89adbf40be1386f3db17dedcbb49445bcad6a679 (patch) | |
| tree | ec00512b822e65e4dd9f5574af563892c377002c /drivers/gpu/Makefile | |
| parent | 7a362f40195528001f33f897c6ed54a39fbfd369 (diff) | |
ux500: drivers/gpu/mali: Updated mali build
The mali device driver git is now checked out in the
driver/gpu/mali/mali400ko folder. This commit adds a .gitignore for
this folder and updates relevant Makefiles and Kconfig.
ST-Ericsson ID: CR335265, CR341392
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I6611a744fdc0fa132aa72ef83a1dd2523a398f91
Signed-off-by: Magnus Wendt <magnus.wendt@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29945
Reviewed-by: Robert FEKETE <robert.fekete@stericsson.com>
Tested-by: Robert FEKETE <robert.fekete@stericsson.com>
Reviewed-by: Ushit KUMAR <ushit.kumar@stericsson.com>
Diffstat (limited to 'drivers/gpu/Makefile')
| -rw-r--r-- | drivers/gpu/Makefile | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index 4c2544fc920..cc9277885dd 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1,8 +1 @@ -<<<<<<< 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 |