diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-11-16 22:21:39 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-11-16 22:21:39 +0000 |
| commit | f178968989ef13e2276554a2f5bd77a994651727 (patch) | |
| tree | 7703643bdeff28414d9f9dbc0585d8e9e5459b56 | |
| parent | 7b861b7e61614c1fa45f16991b4d18dcb86a1df4 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages
2004/11/16 23:18:34+01:00 hrw.one.pl!hrw
collie kernel: removed support for using buzzer as sound device as it broke alarms, keyclicks etc sounds
BKrev: 419a7d739hL_ne7WMrZuM0HvFxlM1Q
| -rw-r--r-- | linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie | 4 | ||||
| -rw-r--r-- | linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie index be3ad3e099..3ff9d6def7 100644 --- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie +++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie @@ -1000,10 +1000,10 @@ CONFIG_FONT_4x6=y # CONFIG_SOUND=y # CONFIG_SOUND_BT878 is not set -CONFIG_SOUND_COLLIE_SSP=m +CONFIG_SOUND_COLLIE_SSP=y CONFIG_COLLIE_PCM1741=y # CONFIG_COLLIE_PCM1717 is not set -CONFIG_SOUND_COLLIE_TC35143=m +CONFIG_SOUND_COLLIE_TC35143=y # CONFIG_SOUND_CMPCI is not set # CONFIG_SOUND_EMU10K1 is not set # CONFIG_MIDI_EMU10K1 is not set diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe index 58d5e3e5aa..ecd4628ccf 100644 --- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe +++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe @@ -5,7 +5,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20030509" -PR = "r10" +PR = "r11" DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices." FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" @@ -27,9 +27,12 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${ file://1764-1.patch;patch=1 \ file://module_licence.patch;patch=1 \ file://defconfig-${MACHINE} \ - file://sound-2.4.18r2.patch;patch=1 \ " +# that patch allow to use buzzer as sound device but it removes alarms, +# touchclicks etc so it is removed until be fixed +# file://sound-2.4.18r2.patch;patch=1 + # apply this when we have a patch that allows building with gcc 3.x: # SRC_URI_append = file://gcc-3.3.patch;patch=1 # SRC_URI_append = file://machtune-args.patch;patch=1 |