git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into timers/core
[pandora-kernel.git]
/
sound
/
Kconfig
diff --git
a/sound/Kconfig
b/sound/Kconfig
index
fcad760
..
1fef141
100644
(file)
--- a/
sound/Kconfig
+++ b/
sound/Kconfig
@@
-97,6
+97,8
@@
source "sound/sh/Kconfig"
# here assuming USB is defined before ALSA
source "sound/usb/Kconfig"
+source "sound/firewire/Kconfig"
+
# the following will depend on the order of config.
# here assuming PCMCIA is defined before ALSA
source "sound/pcmcia/Kconfig"