linux-toradex.git/drivers/net/smc91x.h, branch v2.6.32.45 Linux kernel for Apalis and Colibri modules Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2009-09-18T03:53:52+00:00 Linus Torvalds torvalds@linux-foundation.org 2009-09-18T03:53:52+00:00 f205ce83a766c08965ec78342f138cdc00631fba * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits) be2net: fix some cmds to use mccq instead of mbox atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA pkt_sched: Fix qstats.qlen updating in dump_stats ipv6: Log the affected address when DAD failure occurs wl12xx: Fix print_mac() conversion. af_iucv: fix race when queueing skbs on the backlog queue af_iucv: do not call iucv_sock_kill() twice af_iucv: handle non-accepted sockets after resuming from suspend af_iucv: fix race in __iucv_sock_wait() iucv: use correct output register in iucv_query_maxconn() iucv: fix iucv_buffer_cpumask check when calling IUCV functions iucv: suspend/resume error msg for left over pathes wl12xx: switch to %pM to print the mac address b44: the poll handler b44_poll must not enable IRQ unconditionally ipv6: Ignore route option with ROUTER_PREF_INVALID bonding: make ab_arp select active slaves as other modes cfg80211: fix SME connect rc80211_minstrel: fix contention window calculation ssb/sdio: fix printk format warnings p54usb: add Zcomax XG-705A usbid ... 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
  be2net: fix some cmds to use mccq instead of mbox
  atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
  pkt_sched: Fix qstats.qlen updating in dump_stats
  ipv6: Log the affected address when DAD failure occurs
  wl12xx: Fix print_mac() conversion.
  af_iucv: fix race when queueing skbs on the backlog queue
  af_iucv: do not call iucv_sock_kill() twice
  af_iucv: handle non-accepted sockets after resuming from suspend
  af_iucv: fix race in __iucv_sock_wait()
  iucv: use correct output register in iucv_query_maxconn()
  iucv: fix iucv_buffer_cpumask check when calling IUCV functions
  iucv: suspend/resume error msg for left over pathes
  wl12xx: switch to %pM to print the mac address
  b44: the poll handler b44_poll must not enable IRQ unconditionally
  ipv6: Ignore route option with ROUTER_PREF_INVALID
  bonding: make ab_arp select active slaves as other modes
  cfg80211: fix SME connect
  rc80211_minstrel: fix contention window calculation
  ssb/sdio: fix printk format warnings
  p54usb: add Zcomax XG-705A usbid
  ...
Nicolas Pitre has a new email address 2009-09-15T16:37:12+00:00 Nicolas Pitre nico@fluxnic.net 2009-09-14T07:25:28+00:00 2f82af08fcc7dc01a7e98a49a5995a77e32a2925 Due to problems at cam.org, my nico@cam.org email address is no longer valid. FRom now on, nico@fluxnic.net should be used instead. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 
Due to problems at cam.org, my nico@cam.org email address is no longer
valid.  FRom now on, nico@fluxnic.net should be used instead.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
netdev: smc91x: drop Blackfin cruft 2009-09-15T00:02:57+00:00 Michael Hennerich michael.hennerich@analog.com 2009-09-14T08:03:42+00:00 e4c57d0f964cdbe278ed6b3bf632138fe575267e Now that all Blackfin boards are using the board resources, we don't need to keep the arch/board specific crap in the driver header. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
Now that all Blackfin boards are using the board resources, we don't need
to keep the arch/board specific crap in the driver header.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
smc91x.h: add config for Nomadik evaluation kit 2009-07-27T02:15:07+00:00 Alessandro Rubini rubini-list@gnudd.com 2009-07-22T12:49:08+00:00 4a29f396429132dc59f1856ea6cfc860a1955fa1 Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ARM] pxa/stargate2: Add board specific elements to the smc91x driver 2009-06-05T02:46:25+00:00 Jonathan Cameron jic23@cam.ac.uk 2009-05-12T19:37:20+00:00 80153d1bcc6a20361d5974f37d3729583ba99154 Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.miao@marvell.com> 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Separate out the proc- and unit-specific header directories from the general 2009-04-10T13:33:48+00:00 David Howells dhowells@redhat.com 2009-04-10T13:33:48+00:00 2f2a2132ff056bb45697dc855eb4fd95b70b38cb MN10300 arch headers and place them instead in the same directories as contain the .c files for the processor and unit implementations. This permits the symlinks include/asm/proc and include/asm/unit to be dispensed with. This does, however, require that #include <asm/proc/xxx.h> be converted to #include <proc/xxx.h> and similarly for asm/unit -> unit. Signed-off-by: David Howells <dhowells@redhat.com> 
MN10300 arch headers and place them instead in the same directories as contain
the .c files for the processor and unit implementations.

This permits the symlinks include/asm/proc and include/asm/unit to be
dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.

Signed-off-by: David Howells <dhowells@redhat.com>
MIPS: Alchemy: PB1200: use SMC91X platform data. 2009-03-30T12:49:46+00:00 Manuel Lauss mano@roarinelk.homelinux.net 2009-03-25T16:49:31+00:00 91e8a30e90144bcd0fead02dc57976f304c3b3f7 Add platform data for the smc91x on the PB1200/DB1200, and remove the now unused AU1X00 entry in smc91x.h. Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net> 
Add platform data for the smc91x on the PB1200/DB1200, and remove the
now unused AU1X00 entry in smc91x.h.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Merge branch 'origin' into devel 2009-03-28T20:29:51+00:00 Russell King rmk@dyn-67.arm.linux.org.uk 2009-03-28T20:29:51+00:00 ed40d0c472b136682b2fcba05f89762859c7374f Conflicts: sound/soc/pxa/pxa2xx-i2s.c 
Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c
[ARM] pxa/aspenite: add support for debug ethernet 2009-03-23T02:11:35+00:00 Eric Miao eric.miao@marvell.com 2009-02-18T08:38:22+00:00 a6b993c6b5183fe2af98569cbb7dd8add01b8deb Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com> 
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h 2009-03-09T13:22:38+00:00 Eric Miao eric.miao@marvell.com 2009-01-19T07:28:07+00:00 5742964e916269e01a3467d2bff2601180b7da3d pxa-regs.h and hardware.h are not intended for use directly in driver code, remove those unnecessary references. Signed-off-by: Eric Miao <eric.miao@marvell.com> 
pxa-regs.h and hardware.h are not intended for use directly in driver
code, remove those unnecessary references.

Signed-off-by: Eric Miao <eric.miao@marvell.com>