Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[deliverable/linux.git] / drivers / video / logo / Kconfig

diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 6ba10e3aceff721457f4e13c7aa38f2a025c114e..3e9ccf370ab222cecdd59a0ceacedbac13b6af66 100644 (file)
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -63,5 +63,10 @@ config LOGO_SUPERH_CLUT224
        depends on LOGO && SUPERH
        default y
 
+config LOGO_M32R_CLUT224
+       bool "224-color M32R Linux logo"
+       depends on LOGO && M32R
+       default y
+
 endmenu