diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-02-10 04:48:23 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-10 04:48:23 +0000 |
| commit | 5475414a7806c4f9e82beb940caedfd60a1db74b (patch) | |
| tree | 68df70f926fccd8992df5cfebcb502a3c2f0c28c /packages/linux | |
| parent | 1dfe53cd17ef4fb243b8fbdbd74ccfe76e40c09f (diff) | |
| parent | 52675a0f186a37449790b58e8b4bfd0f7e655251 (diff) | |
merge of 3af6af596405ee2d8df8c79397157adaf28023b3
and 96b18d585efe43c8bffa43523fa2b70496cc94fb
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/ep93xx-kernel/defconfig | 11 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus.inc | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.15.bb | 22 |
3 files changed, 17 insertions, 18 deletions
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig index b92ad0f3cd..9487031705 100644 --- a/packages/linux/ep93xx-kernel/defconfig +++ b/packages/linux/ep93xx-kernel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Thu Feb 9 00:37:45 2006 +# Thu Feb 9 20:06:27 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -162,7 +162,7 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_EP93XX=y +# CONFIG_PCMCIA_EP93XX is not set # # Kernel Features @@ -561,9 +561,9 @@ CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_EP93XX=y -CONFIG_BLK_DEV_IDEDMA_EP93XX=y +# CONFIG_BLK_DEV_IDEDMA_EP93XX is not set CONFIG_IDE_ARM=y -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set @@ -819,7 +819,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # # CONFIG_WATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_RTC=y +# CONFIG_RTC is not set CONFIG_EP93XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -1016,7 +1016,6 @@ CONFIG_SND_PCM=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m -CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set CONFIG_SND_GENERIC_DRIVER=y diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 2fc6f58007..8403965269 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -6,7 +6,7 @@ PROVIDES = "virtual/kernel-hostap" RPROVIDES = "virtual/kernel-hostap" DOSRC = "http://www.do13.de/openzaurus/patches" -RPSRC = "http://www.rpsys.net/openzaurus/patches" +RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index b42f101f50..3eae7cbc84 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -44,20 +44,20 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_bl-r4.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_pcmcia-r2.patch;patch=1 \ - ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \ - ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \ + ${RPSRC}/hx2750_base-r24.patch;patch=1 \ + ${RPSRC}/hx2750_bl-r4.patch;patch=1 \ + ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ + ${RPSRC}/pxa_keys-r5.patch;patch=1 \ + ${RPSRC}/tsc2101-r12.patch;patch=1 \ + ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${DOSRC}/tc6393-device-r8.patch;patch=1 \ ${DOSRC}/tc6393_nand-r7.patch;patch=1 \ ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \ - ${RPSRC}/temp/tosa-pxaac97-r5-rp.patch;patch=1 \ - ${RPSRC}/temp/tosa-tc6393-r1-rp.patch;patch=1 \ - ${RPSRC}/temp/tosa-power-r9-rp.patch;patch=1 \ + ${RPSRC}/tosa-pxaac97-r5-rp.patch;patch=1 \ + ${RPSRC}/tosa-tc6393-r1-rp.patch;patch=1 \ + ${RPSRC}/tosa-power-r9-rp.patch;patch=1 \ ${DOSRC}/tc6393fb-r9.patch;patch=1 \ - ${RPSRC}/temp/tosa-lcd-r6-rp.patch;patch=1 \ + ${RPSRC}/tosa-lcd-r6-rp.patch;patch=1 \ ${DOSRC}/tosa-bl-r9.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ @@ -77,7 +77,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${DOSRC}/kexec-arm-r0.patch \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ - ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + ${RPSRC}/pxa-linking-bug.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ file://defconfig-c7x0 \ |