diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /sound/oss/Kconfig | |
parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
download | linux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz linux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.bz2 linux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'sound/oss/Kconfig')
-rw-r--r-- | sound/oss/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 135a2b77cc4..a513651fa14 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -1,5 +1,3 @@ -# drivers/sound/Config.in -# # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> # More hacking for modularisation. # |