diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:56 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:56 +0100 |
commit | 158c1529fe8d0094d0051169fd2b1a23e6305223 (patch) | |
tree | 0124bd13dba117eb6e167115074ba03417776c31 /sound/Kconfig | |
parent | b5c784894c90042f4fc6348aedc7524e899df281 (diff) | |
parent | 6c7578bb0a631d018a68e5f90554f29fbd928055 (diff) |
Merge branch 'topic/atmel' into for-linus
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 200aca1faa7..1eceb85287c 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -60,6 +60,8 @@ source "sound/aoa/Kconfig" source "sound/arm/Kconfig" +source "sound/atmel/Kconfig" + source "sound/spi/Kconfig" source "sound/mips/Kconfig" |