diff options
Diffstat (limited to 'recipes/openmoko2/openmoko-alsa-scenarios.bb')
| -rw-r--r-- | recipes/openmoko2/openmoko-alsa-scenarios.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes/openmoko2/openmoko-alsa-scenarios.bb b/recipes/openmoko2/openmoko-alsa-scenarios.bb index 72edfef1d1..416d40d92e 100644 --- a/recipes/openmoko2/openmoko-alsa-scenarios.bb +++ b/recipes/openmoko2/openmoko-alsa-scenarios.bb @@ -1,9 +1,13 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" PV = "1.0+svnr${SRCPV}" +<<<<<<< HEAD +PR = "r1" +======= PR = "r2" PROVIDES = "virtual/alsa-scenarios" +>>>>>>> origin/org.openembedded.dev COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" |