diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 09:30:52 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 09:30:52 -0400 |
| commit | 4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1 (patch) | |
| tree | ac23c7b80154a476db3882d92f079c50c919e2fa /kernel/sched/features.h | |
| parent | c818f97bc3266f0fbf619f2348d951272f8ac335 (diff) | |
| parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) | |
Merge branch 'imx/pinctrl' into imx/clock
Conflicts:
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/net/ethernet/freescale/fec.c
drivers/spi/spi-imx.c
drivers/tty/serial/imx.c
This resolves dependencies between the pinctrl and clock changes
in imx.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'kernel/sched/features.h')
| -rw-r--r-- | kernel/sched/features.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/features.h b/kernel/sched/features.h index e61fd73913d0..de00a486c5c6 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h | |||
| @@ -68,3 +68,4 @@ SCHED_FEAT(TTWU_QUEUE, true) | |||
| 68 | 68 | ||
| 69 | SCHED_FEAT(FORCE_SD_OVERLAP, false) | 69 | SCHED_FEAT(FORCE_SD_OVERLAP, false) |
| 70 | SCHED_FEAT(RT_RUNTIME_SHARE, true) | 70 | SCHED_FEAT(RT_RUNTIME_SHARE, true) |
| 71 | SCHED_FEAT(LB_MIN, false) | ||