diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/spi/au1550_spi.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/spi/au1550_spi.c')
| -rw-r--r-- | drivers/spi/au1550_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c index c47a650183a1..41a3d00c4515 100644 --- a/drivers/spi/au1550_spi.c +++ b/drivers/spi/au1550_spi.c | |||
| @@ -99,7 +99,7 @@ static dbdev_tab_t au1550_spi_mem_dbdev = | |||
| 99 | static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw); | 99 | static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw); |
| 100 | 100 | ||
| 101 | 101 | ||
| 102 | /** | 102 | /* |
| 103 | * compute BRG and DIV bits to setup spi clock based on main input clock rate | 103 | * compute BRG and DIV bits to setup spi clock based on main input clock rate |
| 104 | * that was specified in platform data structure | 104 | * that was specified in platform data structure |
| 105 | * according to au1550 datasheet: | 105 | * according to au1550 datasheet: |
| @@ -650,7 +650,7 @@ static int au1550_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
| 650 | return hw->txrx_bufs(spi, t); | 650 | return hw->txrx_bufs(spi, t); |
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | static irqreturn_t au1550_spi_irq(int irq, void *dev, struct pt_regs *regs) | 653 | static irqreturn_t au1550_spi_irq(int irq, void *dev) |
| 654 | { | 654 | { |
| 655 | struct au1550_spi *hw = dev; | 655 | struct au1550_spi *hw = dev; |
| 656 | return hw->irq_callback(hw); | 656 | return hw->irq_callback(hw); |