merge of '44da8efcf85940e173cd83b2ea95fa7ae8782bb5'

     and 'ca1dbbdd8a20d72c6e8277b66f14e016ff7b8cc2'

25 files changed, 57 insertions, 57 deletions

diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 09926ce5c0..7fd152ab40 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 
 
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index 875f47c99c..f17f3168c0 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -1,5 +1,5 @@
 BROKEN = "1"
-#linux-2.6.5-gnalm1-gum0.patch is not fetchable 
+#linux-2.6.5-gnalm1-gum0.patch is not fetchable
 
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for OMAP processors"
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index a75beee997..69e2098055 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -1,7 +1,7 @@
 # Kernel for IXP4xx
 #
-# This bitbake file pulls patches and the defconfig straight  
-# from the NSLU2-Linux SVN repository. Information about this 
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
 # repository can be found at:
 # http://trac.nslu2-linux.org/kernel/
 #
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index a06403c5f4..321d24a035 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -1,7 +1,7 @@
 # Kernel for IXP4xx
 #
-# This bitbake file pulls patches and the defconfig straight  
-# from the NSLU2-Linux SVN repository. Information about this 
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
 # repository can be found at:
 # http://trac.nslu2-linux.org/kernel/
 #
diff --git a/packages/linux/linux-dht-walnut_2.6.12.bb b/packages/linux/linux-dht-walnut_2.6.12.bb
index cdf0c62561..7d362ea659 100644
--- a/packages/linux/linux-dht-walnut_2.6.12.bb
+++ b/packages/linux/linux-dht-walnut_2.6.12.bb
@@ -30,7 +30,7 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config
-#        oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."       
+#        oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
 #        oe_runmake oldconfig
 }
 
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 58d98c37f1..0f4863e125 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -68,7 +68,7 @@ do_configure() {
 	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
 		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-	else 
+	else
 		echo "# CONFIG_AEABI is not set"        >> ${S}/.config
 		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
 	fi
@@ -90,7 +90,7 @@ do_configure() {
 #
 do_compile_append() {
 	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-	if [ $size -ge 1294336 ]; then	
+	if [ $size -ge 1294336 ]; then
 		rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 		echo "Size is $size"
 		die "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular."
@@ -103,7 +103,7 @@ do_compile_append() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib	
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb
index c58e0d46bc..70cb5f4fd7 100644
--- a/packages/linux/linux-geodegx_2.4.24.bb
+++ b/packages/linux/linux-geodegx_2.4.24.bb
@@ -14,12 +14,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 
 S = "${WORKDIR}/linux-${KV}"
 
-inherit kernel 
+inherit kernel
 
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config 
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
         oe_runmake oldconfig
 }
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index f84ceb7f1e..890aa9483a 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -14,7 +14,7 @@ KV = "${PV}"
 
 S = "${WORKDIR}/linux-${KV}"
 
-inherit kernel 
+inherit kernel
 
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
@@ -24,6 +24,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
 	file://defconfig"
 
 do_configure_prepend() {
-	
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config 
+
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 }
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index bbdb696a48..1c22e230e1 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
 	   file://unexpected-int-fix.patch;patch=0 \
 	   file://keymap-fix.patch;patch=0 \
 	   file://io.h-fix.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index 900191ae2b..eea3ceab7e 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -21,7 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
 	   file://Newfile-Epson1356fb.patch;patch=0 \
 	   file://Newfile-Jornada720_kbd.patch;patch=0 \
 	   file://Newfile-Jornada720_ts.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index 4f0349e326..80b1e51a50 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "jornada7xx"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \
            file://defconf_jlime \
 	   file://linux-2.6.18-jornada7xx.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index b2375950e8..034f6d93d1 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -47,14 +47,14 @@ do_configure_prepend() {
 }
 
 do_compile() {
-	
+
 	kernel_do_compile
 
 	# set CONFIG_XIP_KERNEL=y and CONFIG_XIP_PHYS_ADDR=xxxx if commented out, else append it
 #        sed -i -e "s/^[#        ]*CONFIG_XIP_KERNEL.*/CONFIG_XIP_KERNEL=y/" \
 #                -e "s/^[#       ]*CONFIG_XIP_PHYS_ADDR.*/CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}/" .config
 #	grep -q "^CONFIG_XIP_PHYS_ADDR=" .config || echo "CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}" >>.config
-	
+
 #        oe_runmake xipImage CC="arm-linux-gcc " LD="arm-linux-ld " ARCH="arm"
 }
 
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index 47042bfec7..7cdb0b76a9 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -21,24 +21,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 }
 
diff --git a/packages/linux/linux-rp_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb
index 6ce8ba1ab6..f1de99d452 100644
--- a/packages/linux/linux-rp_2.6.16.bb
+++ b/packages/linux/linux-rp_2.6.16.bb
@@ -8,9 +8,9 @@ PR = "r47"
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
+# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://rmk-mmc1.patch;patch=1;status=merged \
@@ -119,12 +119,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 # Disabled until I find the reason this gives issues with cdc_subset
 #            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
 
-# These patches would really help collie/poodle but we 
+# These patches would really help collie/poodle but we
 # need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 #   (Pavel Machek's git tree has updated versions of this?)
 #   Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 
+# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1
 #   (This is mostly in mainline now?)
 # ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
 # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index f2579db66f..f83e88989b 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -8,9 +8,9 @@ PR = "r32"
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
+# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
@@ -85,7 +85,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 2248f88ae0..5b5b14363e 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -10,7 +10,7 @@ PR = "r7"
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
@@ -67,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index e8393c398f..a9786b7609 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1"
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc1 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
@@ -65,7 +65,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index 96307e0f92..d7017310fa 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1"
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
@@ -67,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index d949e13324..efbef7e937 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -13,7 +13,7 @@ PR = "r0"
 # QFMT_V2
 # DNOTIFY?
 # MSDOS_FS, VFAT_FS, NTFS_FS?
-# 
+#
 # USB_GADGET? - USB_GADGET_NET2280, USB_ETH, USB_ETH_RNDIS
 #
 #
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index cf67784af4..4bcdf9d81d 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -97,8 +97,8 @@ addtask unpack_extra after do_unpack before do_patch
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/linux.config ${S}/.config
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-	
-	sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile 
+
+	sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile
 	sed -i -e "s,\-mcpu=,\-mtune=,g;" ${S}/arch/mips/Makefile
 }
 
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 126485b10f..8c04f75779 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 
 
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index cb33b2d172..547010996d 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -53,7 +53,7 @@ module_conf_sa1100_ir = "alias irda0 sa1100_ir"
 
 do_configure() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-              
+
 	mem=${SIMPAD_MEM}
 	rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 24fc3bf149..d9324e9883 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -60,9 +60,9 @@ export CMDLINE = '${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:5
 
 module_conf_sa1100_ir = "alias irda0 sa1100_ir"
 
-do_configure() { 
+do_configure() {
        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-              
+
 	mem=${SIMPAD_MEM}
 	rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index 85f65b519b..d4c93b7b6c 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -39,7 +39,7 @@ SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.b
 
 # that patch allow to use buzzer as sound device but it removes alarms,
 # touchclicks etc so it is removed until be fixed
-#           file://sound-2.4.18r2.patch;patch=1 
+#           file://sound-2.4.18r2.patch;patch=1
 
 # apply this when we have a patch that allows building with gcc 3.x:
 # SRC_URI_append = file://gcc-3.3.patch;patch=1
@@ -93,7 +93,7 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE} 
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
 	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
 }
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 81c24eda13..09c9c3cbad 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
 		   file://patch-2.6.11-mm2-karo9.bz2;patch=1 \
 		   file://defconfig"
- 
+
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'arm.*-linux'