Merging debian version 6.9.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 6 deletions

diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index 03b23a8a7b..b1231104a5 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -1,4 +1,11 @@
 ##
+## file: arch/Kconfig
+##
+## choice: MMU page size
+CONFIG_PAGE_SIZE_4KB=y
+## end choice
+
+##
 ## file: arch/sh/Kconfig
 ##
 ## choice: Processor sub-type selection
@@ -31,9 +38,6 @@ CONFIG_MMU=y
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
 CONFIG_VSYSCALL=y
-## choice: Kernel page size
-CONFIG_PAGE_SIZE_4KB=y
-## end choice
 
 ##
 ## file: drivers/ata/Kconfig
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index ee3e63de17..4e4260b5b3 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -1,4 +1,11 @@
 ##
+## file: arch/Kconfig
+##
+## choice: MMU page size
+CONFIG_PAGE_SIZE_4KB=y
+## end choice
+
+##
 ## file: arch/sh/Kconfig
 ##
 ## choice: Processor sub-type selection
@@ -27,9 +34,6 @@ CONFIG_MMU=y
 CONFIG_MEMORY_START=0x48000000
 CONFIG_MEMORY_SIZE=0x18000000
 CONFIG_VSYSCALL=y
-## choice: Kernel page size
-CONFIG_PAGE_SIZE_4KB=y
-## end choice
 ## choice: HugeTLB page size
 CONFIG_HUGETLB_PAGE_SIZE_64K=y
 ## end choice