diff options
| author | Benn Pörscke <benn.porscke@stericsson.com> | 2011-10-07 15:31:57 +0200 |
|---|---|---|
| committer | Benn Pörscke <benn.porscke@stericsson.com> | 2011-10-07 15:31:57 +0200 |
| commit | 47a4dbf83a75014d6b3467be18997894f1c617db (patch) | |
| tree | 7f5d116db48205309fbc4ae0954f20ab8a651e46 /drivers/gpu | |
| parent | ea8a52f9f4bcc3420c38ae07f8378a2f18443970 (diff) | |
Squashandroid-20111012
Change-Id: If0ae9fa8067740ab2ede33703c79ec134f204a5e
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/Makefile | 3 | ||||
| -rw-r--r-- | drivers/gpu/mali/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/gpu/mali/Makefile | 3 | ||||
| l--------- | drivers/gpu/mali/src | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index 30879df3dae..22100fc9b47 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1 +1,4 @@ obj-y += drm/ vga/ +ifeq ($(CONFIG_GPU_MALI),$(filter $(CONFIG_GPU_MALI),y m)) + obj-$(CONFIG_GPU_MALI) += mali/ +endif diff --git a/drivers/gpu/mali/Kconfig b/drivers/gpu/mali/Kconfig new file mode 100644 index 00000000000..978355d696f --- /dev/null +++ b/drivers/gpu/mali/Kconfig @@ -0,0 +1,7 @@ +config GPU_MALI + tristate "ARM Mali 200/300/400 support" + depends on ARM + ---help--- + This enables support for the ARM Mali 200/300/400 family of GPUs. + Platform specific configuration is made in configuration files in the + drivers/gpu/mali/src folder diff --git a/drivers/gpu/mali/Makefile b/drivers/gpu/mali/Makefile new file mode 100644 index 00000000000..b246233c7db --- /dev/null +++ b/drivers/gpu/mali/Makefile @@ -0,0 +1,3 @@ +ifeq ($(shell [ -f src/Makefile ] && echo "OK"), OK) +obj-$(CONFIG_GPU_MALI) += src/ +endif diff --git a/drivers/gpu/mali/src b/drivers/gpu/mali/src new file mode 120000 index 00000000000..bd5157f132d --- /dev/null +++ b/drivers/gpu/mali/src @@ -0,0 +1 @@ +../../../../vendor/st-ericsson/multimedia/linux/mali400ko/driver/src/devicedrv/mali/
\ No newline at end of file |