diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9700a7aa..a40be431 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r100" +MACHINE_KERNEL_PR = "r101" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/omap4430-panda.conf b/conf/machine/omap4430-panda.conf index bd79280a..8f9f86ef 100644 --- a/conf/machine/omap4430-panda.conf +++ b/conf/machine/omap4430-panda.conf @@ -21,7 +21,6 @@ XSERVER = "xserver-xorg \ xserver-xorg-extension-glx \ xf86-input-evdev \ xf86-input-mouse \ - xf86-input-tslib \ xf86-video-fbdev \ xf86-input-keyboard" diff --git a/recipes-kernel/linux/linux-omap4_2.6.35.7.bb b/recipes-kernel/linux/linux-omap4_2.6.35.7.bb index df5479fd..331433d1 100644 --- a/recipes-kernel/linux/linux-omap4_2.6.35.7.bb +++ b/recipes-kernel/linux/linux-omap4_2.6.35.7.bb @@ -1,8 +1,5 @@ COMPATIBLE_MACHINE = "omap4430-panda" -# Backport for L27.x, needs loads of testing -DEFAULT_PREFERENCE = "-1" - require linux.inc # The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc