History

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Ingo Molnar committed 11 years ago

Commit 02b643b2 parents d1ee8bc 4c09e0d124 files · +855 −1087Browse files

Showing the changes to include/uapi (1 of 124 files). Show all

Unified · Split

include/uapi/sound/asoc.h+6−0
@@ -18,6 +18,12 @@ · 17 unmodified lines
18#include <linux/types.h>18#include <linux/types.h>
19#include <sound/asound.h>19#include <sound/asound.h>
20 20
21#ifndef __KERNEL__
22#error This API is an early revision and not enabled in the current
23#error kernel release, it will be enabled in a future kernel version
24#error with incompatible changes to what is here.
25#endif
26
21/*27/*
22 * Maximum number of channels topology kcontrol can represent.28 * Maximum number of channels topology kcontrol can represent.
23 */29 */