diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/net/pci-skeleton.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/net/pci-skeleton.c')
| -rw-r--r-- | drivers/net/pci-skeleton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index e4a93b8ed485..c47ba3610c58 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
| @@ -105,7 +105,7 @@ IVc. Errata | |||
| 105 | 105 | ||
| 106 | static char version[] __devinitdata = | 106 | static char version[] __devinitdata = |
| 107 | KERN_INFO NETDRV_DRIVER_LOAD_MSG "\n" | 107 | KERN_INFO NETDRV_DRIVER_LOAD_MSG "\n" |
| 108 | KERN_INFO " Support available from http://foo.com/bar/baz.html\n"; | 108 | " Support available from http://foo.com/bar/baz.html\n"; |
| 109 | 109 | ||
| 110 | /* define to 1 to enable PIO instead of MMIO */ | 110 | /* define to 1 to enable PIO instead of MMIO */ |
| 111 | #undef USE_IO_OPS | 111 | #undef USE_IO_OPS |