diff options
| author | Dirk Opfer <dirk@opfer-online.de> | 2006-05-03 21:50:52 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-03 21:50:52 +0000 |
| commit | 59a30d011ab87e0c548218ae5f4cfc76f3b18e64 (patch) | |
| tree | 7a9b271beb5bc9e054bfa6d77b0a3bd30f0ecf33 | |
| parent | e5a2b43fc5b66de287fd24bb721b520df68aa63c (diff) | |
| parent | d3cbbe059a411b8639b398e2a7839da6372fcc54 (diff) | |
merge of 144528a9bcfa570dd68ffc7f5d3c9e1bd2ba097c
and 804d7cf46ef394b8a493beb6a9cef002cd7bb4ee
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.16/defconfig-tosa | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.16.bb | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa index 36dd3c7888..ed4cfd8cb3 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa @@ -1335,7 +1335,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_SA1100 is not set +CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set # diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index ad293b82b3..e37753ee16 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r19" +PR = "r20" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -117,14 +117,19 @@ SRC_URI_append_tosa = "\ ${CHSRC}/tmio-nand-r5.patch;patch=1 \ ${CHSRC}/tmio-ohci-r3.patch;patch=1 \ ${CHSRC}/tmio-fb-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r13.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r14.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \ - ${RPSRC}/temp/tosa-tmio-r4-rp1.patch;patch=1 \ - ${DOSRC}/tosa-power-r14.patch;patch=1 \ - ${RPSRC}/tosa-tmio-lcd-r5-rp1.patch;patch=1 \ - ${DOSRC}/tosa-bluetooth-r5.patch;patch=1 \ + ${DOSRC}/tosa-tmio-r6.patch;patch=1 \ + ${DOSRC}/tosa-power-r15.patch;patch=1 \ + ${DOSRC}/tosa-tmio-lcd-r7.patch;patch=1 \ + ${DOSRC}/tosa-bluetooth-r6.patch;patch=1 \ ${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \ - ${DOSRC}/tosa-asoc-r0.patch;patch=1 " + ${DOSRC}/wm9712-suspend-cold-res-r0.patch;patch=1 \ + ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ + ${DOSRC}/wm9712-reset-loop-r0.patch;patch=1 \ + ${DOSRC}/tosa-asoc-r1.patch;patch=1 " SRC_URI_append_poodle = "\ ${RPSRC}/rp_poodle_hacks-r0.patch;patch=1" |