diff options
| author | Tom King <ka6sox@nslu2-linux.org> | 2005-08-21 00:49:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-21 00:49:53 +0000 |
| commit | 4be7b3f39dfdc93304208fa04cdf3cd012534a84 (patch) | |
| tree | d6529f1ecbcab8085b90e55d9946af0bacc879c8 | |
| parent | 50fb1ac493e9961c0113bfcb826ed5bb756daddc (diff) | |
| parent | 90c78b5bd7e7f720c9d8520703e87194b681289c (diff) | |
merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
and 736b526a3d88e624bef7169dd8ff31366f58593f
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index f51c8e2ba6..cd597fadfe 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r12" +PR = "r13" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 15f2fecdb1..f9c4865c47 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -941,7 +941,9 @@ CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_OSSEMUL=y # # Open Sound System |