diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/linux/topology.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
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 d0890a7e5bab..525d437b1253 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -185,7 +185,6 @@ | |||
| 185 | .max_interval = 64*num_online_cpus(), \ | 185 | .max_interval = 64*num_online_cpus(), \ |
| 186 | .busy_factor = 128, \ | 186 | .busy_factor = 128, \ |
| 187 | .imbalance_pct = 133, \ | 187 | .imbalance_pct = 133, \ |
| 188 | .cache_hot_time = (10*1000000), \ | ||
| 189 | .cache_nice_tries = 1, \ | 188 | .cache_nice_tries = 1, \ |
| 190 | .busy_idx = 3, \ | 189 | .busy_idx = 3, \ |
| 191 | .idle_idx = 3, \ | 190 | .idle_idx = 3, \ |