diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /include/linux/topology.h | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index 2352f46160d3..2d8dac8799cf 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | | SD_BALANCE_FORK \ | 138 | | SD_BALANCE_FORK \ |
| 139 | | SD_BALANCE_EXEC \ | 139 | | SD_BALANCE_EXEC \ |
| 140 | | SD_WAKE_AFFINE \ | 140 | | SD_WAKE_AFFINE \ |
| 141 | | SD_WAKE_IDLE \ | ||
| 142 | | SD_SHARE_PKG_RESOURCES\ | 141 | | SD_SHARE_PKG_RESOURCES\ |
| 143 | | BALANCE_FOR_MC_POWER, \ | 142 | | BALANCE_FOR_MC_POWER, \ |
| 144 | .last_balance = jiffies, \ | 143 | .last_balance = jiffies, \ |