diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /block | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'block')
| -rw-r--r-- | block/ll_rw_blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 1755c053fd..e5041a02e2 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -3385,7 +3385,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action, | |||
| 3385 | } | 3385 | } |
| 3386 | 3386 | ||
| 3387 | 3387 | ||
| 3388 | static struct notifier_block __devinitdata blk_cpu_notifier = { | 3388 | static struct notifier_block blk_cpu_notifier = { |
| 3389 | .notifier_call = blk_cpu_notify, | 3389 | .notifier_call = blk_cpu_notify, |
| 3390 | }; | 3390 | }; |
| 3391 | 3391 | ||