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:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-05-25 23:26:10 -07:00
parent 03194379a7 289c79a4bd
commit 43154d08d6
93 changed files with 1106 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tokenring/3c359.h
View File

@ -264,7 +264,7 @@ struct xl_private {
u16 asb;
u8 __iomem *xl_mmio;
char *xl_card_name;
const char *xl_card_name;
struct pci_dev *pdev ;
spinlock_t xl_lock ;

2
drivers/net/tokenring/olympic.h
View File

@ -254,7 +254,7 @@ struct olympic_private {
u8 __iomem *olympic_mmio;
u8 __iomem *olympic_lap;
struct pci_dev *pdev ;
char *olympic_card_name ;
const char *olympic_card_name;
spinlock_t olympic_lock ;