lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	arch/microblaze/include/asm/socket.h
This commit is contained in:
David S. Miller
2009-08-12 17:44:53 -07:00
parent 07f6642ee9 9799218ae3
commit aa11d958d1
1599 changed files with 38227 additions and 25978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bmac.c
View File

@@ -428,10 +428,11 @@ bmac_init_phy(struct net_device *dev)
printk(KERN_DEBUG "phy registers:");
for (addr = 0; addr < 32; ++addr) {
if ((addr & 7) == 0)
printk("\n" KERN_DEBUG);
printk(" %.4x", bmac_mif_read(dev, addr));
printk(KERN_DEBUG);
printk(KERN_CONT " %.4x", bmac_mif_read(dev, addr));
}
printk("\n");
printk(KERN_CONT "\n");
if (bp->is_bmac_plus) {
unsigned int capable, ctrl;