diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-22 12:31:08 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-22 12:31:08 -0400 |
| commit | 3d98c21d064bfbb8c6fddc659471acb4950320fa (patch) | |
| tree | a506fbe4cca3616f328cdf761a45d0a09ce38237 /kernel/sched/sched.h | |
| parent | 99df18b31db389ec6abc8ad5415c14e7bb752b58 (diff) | |
| parent | ddfb43f3881edb47aa0083651ad31983cdc42c33 (diff) | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.7
Lots and lots of driver specific cleanups and enhancements but the only
substantial framework feature this time round is the compressed API
binding:
- Addition of ASoC bindings for the compressed API, used by the mid-x86
drivers.
- Lots of cleanups and API refreshes for CODEC drivers and DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index f6714d009e77..0848fa36c383 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
| @@ -1144,7 +1144,6 @@ extern void print_rt_stats(struct seq_file *m, int cpu); | |||
| 1144 | 1144 | ||
| 1145 | extern void init_cfs_rq(struct cfs_rq *cfs_rq); | 1145 | extern void init_cfs_rq(struct cfs_rq *cfs_rq); |
| 1146 | extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq); | 1146 | extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq); |
| 1147 | extern void unthrottle_offline_cfs_rqs(struct rq *rq); | ||
| 1148 | 1147 | ||
| 1149 | extern void account_cfs_bandwidth_used(int enabled, int was_enabled); | 1148 | extern void account_cfs_bandwidth_used(int enabled, int was_enabled); |
| 1150 | 1149 | ||