diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-16 14:35:33 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-16 14:35:33 +0000 |
| commit | 1583a7507c224ddefca4c5b2118be14288eb839f (patch) | |
| tree | f4bf057570aa3e02a0c428f1d77b733a5225e346 /packages/linux | |
| parent | 3cb1f292aa4ddce72f970ef4181ee7057cf3b573 (diff) | |
| parent | 8378be7a49b8cdb9935fdeb2594ddd00d89930e1 (diff) | |
merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
and '843d33548c0e77469b4859dd4e3b8c77590cb762'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb | 20 | ||||
| -rw-r--r-- | packages/linux/linux-tornado-omap2/htctornado/defconfig | 5 | ||||
| -rw-r--r-- | packages/linux/linux-tornado-omap2_2.6.16.16.bb | 1 |
3 files changed, 17 insertions, 9 deletions
diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb index 1194f71bb2..48211e54ca 100644 --- a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb +++ b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -86,13 +86,17 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) SRC_URI_append_collie = "\ - ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \ - ${DOSRC}/collie/collie-r0.patch;patch=1 \ - ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \ - ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \ - file://collie-mcp-r1.patch;patch=1 \ - ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \ -# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \ + ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \ " SRC_URI_append_tosa = "\ diff --git a/packages/linux/linux-tornado-omap2/htctornado/defconfig b/packages/linux/linux-tornado-omap2/htctornado/defconfig index 9be1116739..ec67393992 100644 --- a/packages/linux/linux-tornado-omap2/htctornado/defconfig +++ b/packages/linux/linux-tornado-omap2/htctornado/defconfig @@ -259,7 +259,10 @@ CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb index f76442401f..ccbb4cd867 100644 --- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb +++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones." SECTION = "kernel" LICENSE = "GPL" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \ |