diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-02-18 17:10:39 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2009-02-18 17:10:39 +0100 |
| commit | 1c74255afc3d97a2c3cc3a2aead28d5ebd143aff (patch) | |
| tree | 2998683429656422970f4dd2d18856cdc971e6b1 /packages/linux/linux-omap-pm_git.bb | |
| parent | ac1c14116d9f683bd5b3b7541f3f0dbabd1b6f28 (diff) | |
| parent | 5fe2271f2472c39d02c8e2e263ef9660a83327e7 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/linux/linux-omap-pm_git.bb')
| -rw-r--r-- | packages/linux/linux-omap-pm_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux-omap-pm_git.bb b/packages/linux/linux-omap-pm_git.bb index 6481b0caf5..ddaff331a4 100644 --- a/packages/linux/linux-omap-pm_git.bb +++ b/packages/linux/linux-omap-pm_git.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "65d02c2c7fe676369b7162459feec60268c7f4ba" PV = "2.6.28-pm1+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm \ file://defconfig" @@ -45,6 +45,7 @@ SRC_URI_append = " \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ file://dss2.diff;patch=1 \ + file://register-all-OPPs.diff;patch=1 \ " |