into pobox.com:/spare/repo/net-drivers-2.6

The I2C adapter wasn't de-registered correctly in case the video card
wasn't found.  When the I2C subsystem tried to speak with the dangling
I2C adapter later on, usually an oops happened.

Roman Zippel submitted this to lk but I missed it, it does
what I tried to do badly before.
Signed-off-by: Dave Airlie <airlied@linux.ie>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Fixed GPG pin numbering, and missing changelog

Added code to setup the interrupt filtering on
compatible Pins

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file defining S3C2410 SPI registers

Signed-off-by: Klaus Fetscher 
Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Added documentation for the GPIO calls, updated
the overview with more information on the supported
core devices, and updated the state of the EB2410ITX

Signed-off-by: Ben Dooks 

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Comment fixes.
Signed-off-by: Tejun Heo <tj@home-tj.org>

Buffer offset calculation was incorrect in velocity_init_td_ring().
This didn't cause any trouble because we only use the first td ring.
Signed-off-by: Tejun Heo <tj@home-tj.org>

Removed cpu_to_le32 call on OWNED_BY_NIC. This will produce 0x01000000 on
big endian machines while rdesc0.owner still evaluates to 0x00000000 or
0x00000001. BTW, unless we reorder bit fields on big endian machines or
use u32's and cpu_to_le32'd bit mask macros, current code won't work on big
endian machines.
Signed-off-by: Tejun Heo <tj@home-tj.org>

In velocity_init_registers(), init_cam_filter() clears mCAMmask which
might have been set by set_multi() (not sure if this can ever occur).
Modified to invoke init_cam_filter() first. Also, clear_isr() is called
twice. Removed the first invocation.

In velocity_found1(), there was a unneeded assignment from vptr to
dev->priv.  Removed.
Signed-off-by: Tejun Heo <tj@home-tj.org>

There were several receive ring related bugs.

In velocity_give_many_rx_descs(), index calculation was incorrect.
This and bugs in velocity_rx_srv() described in the following paragraph
caused packet loss, truncation and infinite error interrupt generation.

In velocity_rx_srv(), velocity_rx_refill() could be called without any
dirty slot.  With proper timing, This can result in refilling yet
unreceived packets and pushing dirty pointer ahead of the current pointer.
And vptr->rd_curr which is used by velocity_rx_refill() was updated after
calling velocity_rx_refill() thus screwing receive descriptor ring.
Also, between checking owner and reading the packet, rmb() is missing.
Signed-off-by: Tejun Heo <tj@home-tj.org>

In velocity_give_rx_desc(), there should be a wmb() between resetting the
first four bytes of rdesc0 and setting owner. As resetting the first four
bytes isn't necessary, I just removed the function and directly set owner.
Another rationale for removing the function:
The function doesn't handle synchronization. We should do wmb() before
calling the function.  So, I think using bare assignment makes the fact
more explicit.
Signed-off-by: Tejun Heo <tj@home-tj.org>

Removed unused velocity_info.xmit_lock.
Signed-off-by: Tejun Heo <tj@home-tj.org>

velocity_nics wasn't managed properly.
Signed-off-by: Tejun Heo <tj@home-tj.org>

into pobox.com:/spare/repo/net-drivers-2.6

It fixes an oops that results when a lobe fault is detected.  The oops
occurs because a lobe fault triggers an interrupt which is handled
in the current version of the driver by effectively shutting down the
card, and freeing its requisite irq.  The former is fine, the latter
is not, as its illegal to free an irq from within an interrupt context.

I've fixed this bug by removing the call to free_irq from the interrupt
handler (specifically the chunk around line 964 fixes that).  While I
was in there I noticed that there were several other conditions in
the interrupt handler that contained the same condition, so I made
the same fix there.  I re-added.

I also modified the contents of olympic_freemem (the chunk around line
898 to correct a misuse of a pointer after it requisite memory has
been free in the case the the adapter is re-initalized after a fault
to prevent that oops.  And then I clean up the interrupt handler to
simply use olympic_freemem from the close routine since the ring buffer
doesn't need to be freed until the driver is closed.

In addition to these changes I added a call to olympic init in
olympic_open and reset the spinlock so the adapter can be reset and
rejoin the ring without needing to rmmod/insmod the module.  Lastly I
cleaned up the wait queue code so that the close routine didn't have
to wait 60 seconds to close the adapter if a fatal fault has closed
the adapter.
Signed-off-by: Neil Horman <nhorman@redhat.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

Al suggested a sparse warning. And sure enough, it found
these ones.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

The attached patch makes s390 sclp driver buildable again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Add definitions to the MISCCR register for configuration
of the signal states in power down mode.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Include file include/asm-arm/arch-s3c2410/regs-iic.h,
for the I2C controller on the S3C2410 Samsung SoC.

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file include/asm-arm/arch-s3c2410/regs-mem.h containing
definitions for the S3C2410 memory controller

Signed-off-by: Ben Dooks 

Patch from Dave Jiang

Latest IQ80331 redboot changed value of ATU registers and is causing master aborts on the plugged in card. Changing value back to previous sane state for Linux.

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Patch in replacement of 2099/1 due to formatting problems.

Some compilers seem to get "%?" wrong in macros.

We really need to check that we have access to the whole of the
signal frame when we allocate it, rather than "most of it" when
we have iWMMXt extensions selected.

- Use ISA_DMA_THRESHOLD as the mask for GFP_DMA allocations.
- Don't allow DMA allocations which are for a "smaller" mask than
  ISA_DMA_THRESHOLD.
- Ensure that "handle" is initialised to our error value when
  returning an error.

Add locking for use of kecardd services.
Use wait_event_interruptible() rather htan interruptible_sleep_on().

Patch from Ben Dooks

Fix missing changelog entries in <asm-arm/arch-s3c2410/hardware.h>,
and erroneous EINT definitions in <asm-arm/arch-s3c2410/regs-gpio.h>.

Added s3c2410_gpio_getcfg(pin) and s3c2410_gpio_getirq(pin)
to get the current configuration of an pin, and which IRQ
(if any) maps to it.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

USB power control and over-current sense

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Port power control and management for S3C2410 internal
USB controller for different boards to interface their
power control system to.

Signed-off-by: Ben Dooks