Yoshihiro Shimoda
|
ae70644df7
|
net: sh_eth: use ioremap()
This patch also changes writel/readl to iowrite32/ioread32.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
2011-09-28 13:41:50 -04:00 |
|
David S. Miller
|
8decf86879
|
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
|
2011-09-22 03:23:13 -04:00 |
|
David S. Miller
|
823dcd2506
|
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
|
2011-08-20 10:39:12 -07:00 |
|
Jiri Pirko
|
afc4b13df1
|
net: remove use of ndo_set_multicast_list in drivers
replace it by ndo_set_rx_mode
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
2011-08-17 20:22:03 -07:00 |
|
Jeff Kirsher
|
37b937575b
|
sh_eth: Move the Renesas SuperH driver
Move the Renesas driver into drivers/net/ethernet/renesas/ and make
the necessary Kconfig and Makefile changes.
CC: Yoshihiro Shimoda <yoshihiro.shirmoda.uh@renesas.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
2011-08-12 23:47:36 -07:00 |
|