diff options
| author | Jorge Zapata <turran@openmoko.com> | 2009-02-17 09:03:31 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-03-26 21:34:09 +0000 |
| commit | bd3253cdafb13969a3a52e38ec591d8c7df4b5dc (patch) | |
| tree | ce39adc681e3f6d02925c41d91ef8e05778d03cb | |
| parent | 435927c4a69f587505f3429b093ca0e29e45bf1d (diff) | |
Kconfig/Makefile DRM platform support
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/mfd/glamo/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/mfd/glamo/Makefile | 1 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-drm.c | 0 |
4 files changed, 15 insertions, 5 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 5130b72d593..44f95952a8f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -6,7 +6,7 @@ # menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" - depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU + depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU select I2C select I2C_ALGOBIT help @@ -95,7 +95,7 @@ config DRM_I915_KMS config DRM_MGA tristate "Matrox g200/g400" - depends on DRM + depends on DRM && PCI && AGP help Choose this option if you have a Matrox G200, G400 or G450 graphics card. If M is selected, the module will be called mga. AGP @@ -112,14 +112,14 @@ config DRM_SIS config DRM_VIA tristate "Via unichrome video cards" - depends on DRM + depends on DRM && PCI help Choose this option if you have a Via unichrome or compatible video chipset. If M is selected the module will be called via. config DRM_SAVAGE tristate "Savage video cards" - depends on DRM + depends on DRM && PCI help Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index d2ab3706f8f..4410d1e3245 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -44,4 +44,13 @@ config MFD_GLAMO_MCI the S-Media GLAMO chip, as used in Openmoko neo1973 GTA-02. - If unsure, say N.
\ No newline at end of file + If unsure, say N. +config MFD_GLAMO_DRM + tristate "Glamo DRM support" + depends on MFD_GLAMO && DRM + help + Direct Rendering Manager interface for the S-Media GLAMO chip, as + used in Openmoko neo1973 GTA-02. + + If unsure, say N. + diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile index dc64d50fa13..0e951ccf200 100644 --- a/drivers/mfd/glamo/Makefile +++ b/drivers/mfd/glamo/Makefile @@ -9,4 +9,5 @@ obj-$(CONFIG_MFD_GLAMO_SPI_GPIO) += glamo-spi-gpio.o obj-$(CONFIG_MFD_GLAMO_FB) += glamo-fb.o obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o +obj-$(CONFIG_MFD_GLAMO_DRM) += glamo-drm.o diff --git a/drivers/mfd/glamo/glamo-drm.c b/drivers/mfd/glamo/glamo-drm.c new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/drivers/mfd/glamo/glamo-drm.c |