[kernel] r18722 - dists/sid/linux-2.6/debian/config/sh4

[Ben Hutchings]

Author: benh
Date: Tue Feb 21 05:01:46 2012
New Revision: 18722

Log:
sh4: Remove automatic config definitions

Modified:
   dists/sid/linux-2.6/debian/config/sh4/config.sh7751r
   dists/sid/linux-2.6/debian/config/sh4/config.sh7785lcr

Modified: dists/sid/linux-2.6/debian/config/sh4/config.sh7751r
==============================================================================
--- dists/sid/linux-2.6/debian/config/sh4/config.sh7751r	Tue Feb 21 04:55:25 2012	(r18721)
+++ dists/sid/linux-2.6/debian/config/sh4/config.sh7751r	Tue Feb 21 05:01:46 2012	(r18722)
@@ -204,10 +204,3 @@
 CONFIG_FLATMEM_MANUAL=y
 ## end choice
 
-##
-## file: unknown
-##
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y
-

Modified: dists/sid/linux-2.6/debian/config/sh4/config.sh7785lcr
==============================================================================
--- dists/sid/linux-2.6/debian/config/sh4/config.sh7785lcr	Tue Feb 21 04:55:25 2012	(r18721)
+++ dists/sid/linux-2.6/debian/config/sh4/config.sh7785lcr	Tue Feb 21 05:01:46 2012	(r18722)
@@ -262,9 +262,6 @@
 ##
 ## file: unknown
 ##
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_PMB_ENABLE=y
 CONFIG_PMB_FIXED=y
-CONFIG_SH_PCIDMA_NONCOHERENT=y