aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/renesas
Commit message (Collapse)AuthorAge
* net: sh_eth: fix build failureYoshihiro Shimoda2011-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit removed some including headers: "net: sh_eth: move the asm/sh_eth.h to include/linux/" (commit id: d4fa0e35fdbd54acf791fa3793d6d17f7795f7ae) Then, the build failure happened on the linux-next: drivers/net/ethernet/renesas/sh_eth.c:601: error: 'THIS_MODULE' undeclared here (not in a function) drivers/net/ethernet/renesas/sh_eth.c:1970: error: expected declaration specifiers or '...' before string constant drivers/net/ethernet/renesas/sh_eth.c:1970: warning: data definition has no type or storage class drivers/net/ethernet/renesas/sh_eth.c:1970: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' drivers/net/ethernet/renesas/sh_eth.c:1970: warning: function declaration isn't a prototype drivers/net/ethernet/renesas/sh_eth.c:1971: error: expected declaration specifiers or '...' before string constant drivers/net/ethernet/renesas/sh_eth.c:1971: warning: data definition has no type or storage class drivers/net/ethernet/renesas/sh_eth.c:1971: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION' drivers/net/ethernet/renesas/sh_eth.c:1971: warning: function declaration isn't a prototype drivers/net/ethernet/renesas/sh_eth.c:1972: error: expected declaration specifiers or '...' before string constant drivers/net/ethernet/renesas/sh_eth.c:1972: warning: data definition has no type or storage class drivers/net/ethernet/renesas/sh_eth.c:1972: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE' drivers/net/ethernet/renesas/sh_eth.c:1972: warning: function declaration isn't a prototype This patch fixes the issue. This patch also get back include/kernel.h and linux/spinlock.h. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: sh_eth: move the asm/sh_eth.h to include/linux/Yoshihiro Shimoda2011-09-28
| | | | | Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: sh_eth: use ioremap()Yoshihiro Shimoda2011-09-28
| | | | | | | 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>
* Merge branch 'master' of github.com:davem330/netDavid S. Miller2011-09-22
| | | | | | | | | | | | 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
* MII: fix Kconfig dependencies for MIIJeff Kirsher2011-09-15
| | | | | | | | | | | | | | | | MII Kconfig option is apart of the core networking drivers and by default NET_CORE is enabled so drivers selecting MII will have MII enabled as well. It was found using the randconfig option during testing, MII would be selected but NET_CORE could be disabled. This caused a dependency error. Resolved the dependency by selecting NET_CORE when MII is selected. Reported-by: Emil Tantilov <emil.s.tantilov@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-08-20
|
* net: remove use of ndo_set_multicast_list in driversJiri Pirko2011-08-17
| | | | | | | replace it by ndo_set_rx_mode Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* sh_eth: Move the Renesas SuperH driverJeff Kirsher2011-08-13
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>