From ecc79383cff424030413058a76828b524e133fc7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 13 Jan 2012 02:15:01 +0000
Subject: [PATCH] staging: Enable STAGING_MEDIA, which various drivers now
 depend on (Closes: #654800)

svn path=/dists/trunk/linux-2.6/; revision=18514
---
 debian/changelog     | 2 ++
 debian/config/config | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 58fd665a0..9c7a97117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low
   * Install /lib/modules/<kernel-version>/modules.builtin in linux-image
     packages
   * [ia64] Add accept4() syscall (Closes: #647825)
+  * staging: Enable STAGING_MEDIA, which various drivers now depend on
+    (Closes: #654800)
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.
diff --git a/debian/config/config b/debian/config/config
index 3009ffb01..980831c42 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2783,6 +2783,11 @@ CONFIG_STAGING=y
 ##
 # CONFIG_LINE6_USB is not set
 
+##
+## file: drivers/staging/media/Kconfig
+##
+CONFIG_STAGING_MEDIA=y
+
 ##
 ## file: drivers/staging/media/go7007/Kconfig
 ##