diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-powerpc/topology.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/topology.h')
| -rw-r--r-- | include/asm-powerpc/topology.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index 50c014007de7..6610495f5f16 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h | |||
| @@ -66,6 +66,7 @@ static inline int pcibus_to_node(struct pci_bus *bus) | |||
| 66 | | SD_BALANCE_EXEC \ | 66 | | SD_BALANCE_EXEC \ |
| 67 | | SD_BALANCE_NEWIDLE \ | 67 | | SD_BALANCE_NEWIDLE \ |
| 68 | | SD_WAKE_IDLE \ | 68 | | SD_WAKE_IDLE \ |
| 69 | | SD_SERIALIZE \ | ||
| 69 | | SD_WAKE_BALANCE, \ | 70 | | SD_WAKE_BALANCE, \ |
| 70 | .last_balance = jiffies, \ | 71 | .last_balance = jiffies, \ |
| 71 | .balance_interval = 1, \ | 72 | .balance_interval = 1, \ |