diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 07:53:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 07:53:06 -0700 |
| commit | 75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7 (patch) | |
| tree | 11de004529d01abded73a9392715baebab2e2a6d /drivers/net | |
| parent | 3568bd9720b4a775f28a718fcbb462ce2f386988 (diff) | |
| parent | a904f5f9eb7a55baacb2f4c1423cac8a8eb78a3a (diff) | |
| download | op-kernel-dev-75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7.zip op-kernel-dev-75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7.tar.gz | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses
ARM: 6892/1: handle ptrace requests to change PC during interrupted system calls
ARM: 6890/1: memmap: only free allocated memmap entries when using SPARSEMEM
ARM: zImage: the page table memory must be considered before relocation
ARM: zImage: make sure not to relocate on top of the relocation code
ARM: zImage: Fix bad SP address after relocating kernel
ARM: zImage: make sure the stack is 64-bit aligned
ARM: RiscPC: acornfb: fix section mismatches
ARM: RiscPC: etherh: fix section mismatches
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/arm/etherh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index 4af235d..fbfb5b4 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c @@ -527,7 +527,7 @@ static void __init etherh_banner(void) * Read the ethernet address string from the on board rom. * This is an ascii string... */ -static int __init etherh_addr(char *addr, struct expansion_card *ec) +static int __devinit etherh_addr(char *addr, struct expansion_card *ec) { struct in_chunk_dir cd; char *s; @@ -655,7 +655,7 @@ static const struct net_device_ops etherh_netdev_ops = { static u32 etherh_regoffsets[16]; static u32 etherm_regoffsets[16]; -static int __init +static int __devinit etherh_probe(struct expansion_card *ec, const struct ecard_id *id) { const struct etherh_data *data = id->data; |
