Merge branch 'andy-tracking' into drm-tracking
authorThomas White <taw@bitwiz.org.uk>
Sat, 25 Apr 2009 18:23:57 +0000 (19:23 +0100)
committerThomas White <taw@bitwiz.org.uk>
Sat, 25 Apr 2009 18:23:57 +0000 (19:23 +0100)
Conflicts:
drivers/mfd/glamo/Kconfig

1  2 
arch/arm/mach-s3c2442/mach-gta02.c
drivers/mfd/glamo/Kconfig
drivers/mfd/glamo/glamo-fb.c

Simple merge
@@@ -45,12 -55,3 +55,12 @@@ config MFD_GLAMO_MC
          neo1973 GTA-02.
  
          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.
Simple merge