[meta-intel] [PATCH 1/1] emenlow: fix gma500 kernel feature name for v3.8 & dev kernels

[Tom Zanussi]

On Thu, 2014-01-16 at 14:29 -0800, nitin.a.kamble at intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble at intel.com>
> 
> The gma600 feature has been merged into the gma500 feature in the
> linux-yocto kernel repository. The kernel recipe need to use the gma500
> feature instead of the removed gma600 feature.
> 

Pulled into meta-intel/master.

Thanks,

Tom

> Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> ---
>  meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +-
>  meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
> index 00ab0fd..e540b2f 100644
> --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -8,7 +8,7 @@ KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
>  COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
>  KMACHINE_emenlow-noemgd = "emenlow"
>  KBRANCH_emenlow-noemgd = "standard/emenlow"
> -KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600"
> +KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
>  
>  SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238"
>  SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391"
> diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
> index ad2bc64..14a2bb0 100644
> --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
> +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.8.bbappend
> @@ -8,7 +8,7 @@ KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
>  COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
>  KMACHINE_emenlow-noemgd = "emenlow"
>  KBRANCH_emenlow-noemgd = "standard/emenlow"
> -KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma600"
> +KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
>  
>  LINUX_VERSION = "3.8.13"
>