diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 16:00:22 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 16:00:22 +0100 |
commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
tree | daada742542518b02d7db7c5d32e715eaa5f166d /sound/aoa | |
parent | ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format (diff) | |
parent | Merge branch 'akpm' (aka "Andrew's patch-bomb, take two") (diff) | |
download | linux-4de3a8e101150feaefa1139611a50ff37467f33e.tar.xz linux-4de3a8e101150feaefa1139611a50ff37467f33e.zip |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/aoa')
-rw-r--r-- | sound/aoa/codecs/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig index 808eb11ebacd..0c68e32834c3 100644 --- a/sound/aoa/codecs/Kconfig +++ b/sound/aoa/codecs/Kconfig @@ -7,14 +7,6 @@ config SND_AOA_ONYX codec chip found in the latest Apple machines (most of those with digital audio output). -#config SND_AOA_TOPAZ -# tristate "support Topaz chips" -# ---help--- -# This option enables support for the Topaz (CS84xx) -# codec chips found in the latest Apple machines, -# these chips do the digital input and output on -# some PowerMacs. - config SND_AOA_TAS tristate "support TAS chips" select I2C |