diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/linux/topology.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index a305ae2e44b6..ec1eca85290a 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -134,7 +134,8 @@ | |||
| 134 | .flags = SD_LOAD_BALANCE \ | 134 | .flags = SD_LOAD_BALANCE \ |
| 135 | | SD_BALANCE_NEWIDLE \ | 135 | | SD_BALANCE_NEWIDLE \ |
| 136 | | SD_BALANCE_EXEC \ | 136 | | SD_BALANCE_EXEC \ |
| 137 | | SD_WAKE_AFFINE, \ | 137 | | SD_WAKE_AFFINE \ |
| 138 | | BALANCE_FOR_POWER, \ | ||
| 138 | .last_balance = jiffies, \ | 139 | .last_balance = jiffies, \ |
| 139 | .balance_interval = 1, \ | 140 | .balance_interval = 1, \ |
| 140 | .nr_balance_failed = 0, \ | 141 | .nr_balance_failed = 0, \ |