diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:26:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:26:44 -0500 |
| commit | 93bfbd71db4d2e01c05e219f285249a74808b1d4 (patch) | |
| tree | 43f38899aaa2af9169146b6523d094be299ccc60 /drivers/net | |
| parent | 31c952dcf83d5b0fd57b514cbe8a1664647c26e7 (diff) | |
| parent | 7fbb7cadd062baf299fd8b26a80ea99da0c3fe01 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks
powerpc: Fix oops on some machines due to incorrect pr_debug()
powerpc/ps3: Printing fixups for l64 to ll64 convserion drivers/net
powerpc/5200: update device tree binding documentation
powerpc/5200: Bugfix for PCI mapping of memory and IMMR
powerpc/5200: update defconfigs
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ps3_gelic_wireless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index ec2314246682..335da4831ab3 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
| @@ -2168,7 +2168,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl, | |||
| 2168 | complete(&wl->assoc_done); | 2168 | complete(&wl->assoc_done); |
| 2169 | netif_carrier_on(port_to_netdev(wl_port(wl))); | 2169 | netif_carrier_on(port_to_netdev(wl_port(wl))); |
| 2170 | } else | 2170 | } else |
| 2171 | pr_debug("%s: event %#lx under wpa\n", | 2171 | pr_debug("%s: event %#llx under wpa\n", |
| 2172 | __func__, event); | 2172 | __func__, event); |
| 2173 | } | 2173 | } |
| 2174 | 2174 | ||