diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /sound/Kconfig | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
Diffstat (limited to 'sound/Kconfig')
| -rw-r--r-- | sound/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index 200aca1faa71..1eceb85287c5 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
| @@ -60,6 +60,8 @@ source "sound/aoa/Kconfig" | |||
| 60 | 60 | ||
| 61 | source "sound/arm/Kconfig" | 61 | source "sound/arm/Kconfig" |
| 62 | 62 | ||
| 63 | source "sound/atmel/Kconfig" | ||
| 64 | |||
| 63 | source "sound/spi/Kconfig" | 65 | source "sound/spi/Kconfig" |
| 64 | 66 | ||
| 65 | source "sound/mips/Kconfig" | 67 | source "sound/mips/Kconfig" |