Commit 50631ef3 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 8ef7734c 1e3cc3f5
...@@ -121,8 +121,8 @@ unsigned long SYSRQ_KEY; ...@@ -121,8 +121,8 @@ unsigned long SYSRQ_KEY;
static int ppc64_panic_event(struct notifier_block *, unsigned long, void *); static int ppc64_panic_event(struct notifier_block *, unsigned long, void *);
static struct notifier_block ppc64_panic_block = { static struct notifier_block ppc64_panic_block = {
notifier_call: ppc64_panic_event, .notifier_call = ppc64_panic_event,
priority: INT_MIN /* may not return; must be done last */ .priority = INT_MIN /* may not return; must be done last */
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment