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

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
50631ef3 · Linus Torvalds · 8ef7734c · 1e3cc3f5 · 50631ef3
Commit 50631ef3 authored Oct 04, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/ppc64/kernel/setup.c arch/ppc64/kernel/setup.c +2 -2

No files found.
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -121,8 +121,8 @@ unsigned long SYSRQ_KEY;

 static int ppc64_panic_event(struct notifier_block *, unsigned long, void *);
 static struct notifier_block ppc64_panic_block = {
-	notifier_call: ppc64_panic_event,
-	priority: INT_MIN /* may not return; must be done last */
+	.notifier_call = ppc64_panic_event,
+	.priority = INT_MIN /* may not return; must be done last */
 };

 /*