[oe] [meta-handheld][PATCH] linux-yocto_3.14: zaurus: config serial 8250 as module

[Andrea Adami]

Zaurus is using pxa/sa1100 serial so we only need the
pcmcia serial cs for i.e. bluetooth cf cards.
Avoid device address conflict on pxa (fix pending upstream).

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 recipes-kernel/linux/linux-yocto-3.14/akita/defconfig  | 4 ++--
 recipes-kernel/linux/linux-yocto-3.14/c7x0/defconfig   | 4 ++--
 recipes-kernel/linux/linux-yocto-3.14/collie/defconfig | 4 ++--
 recipes-kernel/linux/linux-yocto-3.14/poodle/defconfig | 4 ++--
 recipes-kernel/linux/linux-yocto-3.14/spitz/defconfig  | 4 ++--
 recipes-kernel/linux/linux-yocto-3.14/tosa/defconfig   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.14/akita/defconfig b/recipes-kernel/linux/linux-yocto-3.14/akita/defconfig
index 8e58216..7d7046a 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/akita/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/akita/defconfig
@@ -242,8 +242,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.14/c7x0/defconfig b/recipes-kernel/linux/linux-yocto-3.14/c7x0/defconfig
index 3a112db..2714fd7 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/c7x0/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/c7x0/defconfig
@@ -223,8 +223,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig b/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
index 8c84b6c..55cbd91 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/collie/defconfig
@@ -226,8 +226,8 @@ CONFIG_KEYBOARD_LOCOMO=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_SA1100=y
 CONFIG_SERIAL_SA1100_CONSOLE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.14/poodle/defconfig b/recipes-kernel/linux/linux-yocto-3.14/poodle/defconfig
index 3e76043..1805246 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/poodle/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/poodle/defconfig
@@ -221,8 +221,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.14/spitz/defconfig b/recipes-kernel/linux/linux-yocto-3.14/spitz/defconfig
index 56db157..bece3f9 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/spitz/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/spitz/defconfig
@@ -241,8 +241,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.14/tosa/defconfig b/recipes-kernel/linux/linux-yocto-3.14/tosa/defconfig
index 799be1f..dc8f2ba 100644
--- a/recipes-kernel/linux/linux-yocto-3.14/tosa/defconfig
+++ b/recipes-kernel/linux/linux-yocto-3.14/tosa/defconfig
@@ -242,8 +242,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
-- 
1.9.1