diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /sound/usb/Kconfig | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'sound/usb/Kconfig')
| -rw-r--r-- | sound/usb/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 523aec188ccf..73525c048e7f 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig | |||
| @@ -48,6 +48,7 @@ config SND_USB_CAIAQ | |||
| 48 | * Native Instruments Kore Controller | 48 | * Native Instruments Kore Controller |
| 49 | * Native Instruments Kore Controller 2 | 49 | * Native Instruments Kore Controller 2 |
| 50 | * Native Instruments Audio Kontrol 1 | 50 | * Native Instruments Audio Kontrol 1 |
| 51 | * Native Instruments Audio 2 DJ | ||
| 51 | * Native Instruments Audio 4 DJ | 52 | * Native Instruments Audio 4 DJ |
| 52 | * Native Instruments Audio 8 DJ | 53 | * Native Instruments Audio 8 DJ |
| 53 | * Native Instruments Guitar Rig Session I/O | 54 | * Native Instruments Guitar Rig Session I/O |