1. 14 Aug, 2008 4 commits
    • Brice Goglin's avatar
      myri10ge: myri10ge_fw_name also overrides the rss firmware · 13b2738c
      Brice Goglin authored
      When myri10ge_fw_name is given, use it to override the rss firmware
      name as well.
      Signed-off-by: default avatarBrice Goglin <brice@myri.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      13b2738c
    • Mikael Pettersson's avatar
      ixp4xx_eth: fix dma_mapping_error() compile errors · 7144decb
      Mikael Pettersson authored
      The arm ixp4xx_eth driver doesn't compile in 2.6.27-rc1:
      
        CC [M]  drivers/net/arm/ixp4xx_eth.o
      drivers/net/arm/ixp4xx_eth.c: In function 'eth_poll':
      drivers/net/arm/ixp4xx_eth.c:554: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
      drivers/net/arm/ixp4xx_eth.c:554: error: too few arguments to function 'dma_mapping_error'
      drivers/net/arm/ixp4xx_eth.c: In function 'eth_xmit':
      drivers/net/arm/ixp4xx_eth.c:701: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
      drivers/net/arm/ixp4xx_eth.c:701: error: too few arguments to function 'dma_mapping_error'
      drivers/net/arm/ixp4xx_eth.c: In function 'init_queues':
      drivers/net/arm/ixp4xx_eth.c:886: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
      drivers/net/arm/ixp4xx_eth.c:886: error: too few arguments to function 'dma_mapping_error'
      make[3]: *** [drivers/net/arm/ixp4xx_eth.o] Error 1
      make[2]: *** [drivers/net/arm] Error 2
      make[1]: *** [drivers/net] Error 2
      make: *** [drivers] Error 2
      
      dma_mapping_error() changed in 2.6.27-rc1 to also take a device parameter,
      but nobody bothered updating ixp4xx_eth.c. Fixed by passing the appropriate
      device value in the dma_mapping_error() calls.
      
      Tested on an ixp425 box.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      7144decb
    • Scott Wood's avatar
      gianfar: Call gfar_halt_nodisable() from gfar_halt(). · 2a54adc3
      Scott Wood authored
      gfar_halt() was factored out into halting and disabling by commit
      d87eb127, as the suspend() method
      only wants to do the former.  However, the call to gfar_halt_nodisable()
      from gfar_halt() apparently got lost during the patch respin process.
      
      This adds it back.
      Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      2a54adc3
    • Huang Weiyi's avatar
      [netdrvr] remove unnecessary #include · fde9403a
      Huang Weiyi authored
      The drivers below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.
        drivers/net/acenic.c
        drivers/net/bnx2x_link.c
        drivers/net/bnx2x_main.c
        drivers/net/cpmac.c
        drivers/net/gianfar_sysfs.c
        drivers/net/ipg.h
        drivers/net/ppp_mppe.c
        drivers/net/pppol2tp.c
        drivers/net/r6040.c
        drivers/net/sh_eth.c
        drivers/net/sky2.c
        drivers/net/tehuti.h
        drivers/net/typhoon.c
      
      This patch removes the said #include <linux/version.h>.
      Signed-off-by: default avatarHuang Weiyi <hwy@cn.fujitsu.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      fde9403a
  2. 13 Aug, 2008 36 commits