diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/spi/spi_s3c24xx.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/spi/spi_s3c24xx.c')
| -rw-r--r-- | drivers/spi/spi_s3c24xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 20eb6e95a3a0..2ebe1fc4c398 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
| @@ -196,7 +196,7 @@ static int s3c24xx_spi_txrx(struct spi_device *spi, struct spi_transfer *t) | |||
| 196 | return hw->count; | 196 | return hw->count; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | static irqreturn_t s3c24xx_spi_irq(int irq, void *dev, struct pt_regs *regs) | 199 | static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) |
| 200 | { | 200 | { |
| 201 | struct s3c24xx_spi *hw = dev; | 201 | struct s3c24xx_spi *hw = dev; |
| 202 | unsigned int spsta = readb(hw->regs + S3C2410_SPSTA); | 202 | unsigned int spsta = readb(hw->regs + S3C2410_SPSTA); |