From 6a5ca4a74487ea9bc46249d540814d1e55c7245f Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Wed, 11 Apr 2012 16:15:15 +0100
Subject: [PATCH] raspberrypi.conf: Bump MACHINE_KERNEL_PR.

* Also reset to a zImage ;).
---
 conf/machine/raspberrypi.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 conf/machine/raspberrypi.conf

diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
old mode 100644
new mode 100755
index 3bb2836..b72105d
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -13,9 +13,8 @@ IMAGE_FSTYPES += "tar.bz2"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-# Put it below omap3.inc as we override the kernel and PR here
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r2"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
@@ -27,7 +26,7 @@ XSERVER = " \
 	xf86-video-fbdev \
 "
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
 
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"