diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /sound/aoa/Kconfig | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| download | op-kernel-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.zip op-kernel-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.gz | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'sound/aoa/Kconfig')
| -rw-r--r-- | sound/aoa/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig new file mode 100644 index 0000000..a85194f --- /dev/null +++ b/sound/aoa/Kconfig @@ -0,0 +1,17 @@ +menu "Apple Onboard Audio driver" + depends on SND!=n && PPC + +config SND_AOA + tristate "Apple Onboard Audio driver" + depends on SOUND && SND_PCM + ---help--- + This option enables the new driver for the various + Apple Onboard Audio components. + +source "sound/aoa/fabrics/Kconfig" + +source "sound/aoa/codecs/Kconfig" + +source "sound/aoa/soundbus/Kconfig" + +endmenu |
