summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-08-26 10:14:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-26 10:14:00 +0000
commit8acf15a3b7aff17ec888c476cd2deeb2271e5124 (patch)
treec709aa61e00ef9d57bfd427c4f5c1a87f6d334e2
parentad3b54a8385f73950e943c1e1a975d7823c05abf (diff)
parentb18d365c729f7af14552950135cf6d9abd47203d (diff)
merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
and 13f41f22b28195db22a3edccf3d65864ffb89f46
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 0bae9c58af..f639ac23d8 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r14"
+PR = "r15"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -47,11 +47,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
${DOSRC}/mmc-bulk-r0.patch;patch=1 \
${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
- ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \
@@ -61,9 +64,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${RPSRC}/corgi_pm-r0.patch;patch=1 \
${RPSRC}/spitzkbd-r1.patch;patch=1 \
${RPSRC}/spitzcf-r1.patch;patch=1 \
- ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
- ${RPSRC}/pxa_irda-r2.patch;patch=1 \
+ ${RPSRC}/pxa_irda-r3.patch;patch=1 \
${RPSRC}/corgi_irda-r3.patch;patch=1 \
${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
@@ -92,14 +94,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/spitz_base-r8.patch;patch=1 \
+ ${RPSRC}/spitz_base-r9.patch;patch=1 \
${RPSRC}/spitz_pm-r0.patch;patch=1 \
${RPSRC}/scoop_susres-r0.patch;patch=1 \
- ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
- ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
@@ -158,6 +158,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
# Enable or disable ELPP via local.conf - default is "no"
#
ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+
###############################################################
# module configs specific to this kernel
#