aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2011-06-11 02:27:29 +0200
committerAndrea Adami <andrea.adami@gmail.com>2011-06-11 02:27:29 +0200
commitfafce8ca85cce4a5df3278434bfe7f3930941c27 (patch)
treec9ea6dc10b94460f41387da8caafd035a82127a8 /recipes/linux
parent7ac07f3dea7181c050a9695331bc6bb0f08df9df (diff)
downloadopenembedded-fafce8ca85cce4a5df3278434bfe7f3930941c27.tar.gz
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@gmail.com>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux/poodle/defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes/linux/linux/poodle/defconfig b/recipes/linux/linux/poodle/defconfig
index 94c8702fcb..0f5bdade7e 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