diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:55:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:56:13 -0400 |
| commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
| tree | c381fcfcfeb38515bfa93445c80ad9231343414d /Documentation/DocBook/kernel-hacking.tmpl | |
| parent | 240ebbf81f149b11a31e060ebe5ee51a3c775360 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/DocBook/kernel-hacking.tmpl')
| -rw-r--r-- | Documentation/DocBook/kernel-hacking.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index a50d6cd58573..992e67e6be7f 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl | |||
| @@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i); | |||
| 449 | </para> | 449 | </para> |
| 450 | 450 | ||
| 451 | <programlisting> | 451 | <programlisting> |
| 452 | __u32 ipaddress; | 452 | __be32 ipaddress; |
| 453 | printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress)); | 453 | printk(KERN_INFO "my ip: %pI4\n", &ipaddress); |
| 454 | </programlisting> | 454 | </programlisting> |
| 455 | 455 | ||
| 456 | <para> | 456 | <para> |