[PATCH] om-gta02.conf : fix rebase merge problems

[Graeme Gregory]

---
 conf/machine/om-gta02.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index d35da04..eafcf43 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,7 +6,7 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 UBOOT_ENTRYPOINT = "30008000"
 
-- 
1.5.6.5


--------------060801010108080900040505--