diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
| commit | df597efb5737063497f1a4f7c996cc9aec294230 (patch) | |
| tree | 17bb60f68ee299d9717038197a932501625f1621 /Documentation | |
| parent | a33bc5c15154c835aae26f16e6a3a7d9ad4acb45 (diff) | |
| parent | 0a924578bc4a2823a95c151f56975c71f5c156bb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'Documentation')
| -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> |