[oe-commits] Andrea Adami : linux: update defconfig for poodle used in the _git version

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: fafce8ca85cce4a5df3278434bfe7f3930941c27
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=fafce8ca85cce4a5df3278434bfe7f3930941c27

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sat Jun 11 02:27:29 2011 +0200

linux: update defconfig for poodle used in the _git version

* synch with 2.6.39
* remove CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
* machine-id is passed by kexec
* follow other Zaurus devices

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>

---

 recipes/linux/linux/poodle/defconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/recipes/linux/linux/poodle/defconfig b/recipes/linux/linux/poodle/defconfig
index 94c8702..0f5bdad 100644
--- a/recipes/linux/linux/poodle/defconfig
+++ b/recipes/linux/linux/poodle/defconfig
@@ -23,7 +23,6 @@ CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=m
 CONFIG_ARCH_PXA=y
 CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
 CONFIG_MACH_POODLE=y
 CONFIG_PCCARD=y
 CONFIG_PCMCIA_PXA2XX=y