diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
| commit | 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1 (patch) | |
| tree | 98c994692f84aee07cf1c7b4cda245ae5235a94d /drivers/sbus/char/bbc_i2c.c | |
| parent | 7fc7d047216aa4923d401c637be2ebc6e3d5bd9b (diff) | |
| parent | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (diff) | |
| download | talos-op-linux-2fc565e4eaf8fc633bfc741b90e1f28dba732ee1.tar.gz talos-op-linux-2fc565e4eaf8fc633bfc741b90e1f28dba732ee1.zip | |
Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
A few more fixes, nothing too major though the DMA changes fix modular
builds.
Diffstat (limited to 'drivers/sbus/char/bbc_i2c.c')
| -rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 1a9d1e3ce64c..c1441ed282eb 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c @@ -282,7 +282,7 @@ static irqreturn_t bbc_i2c_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static void __init reset_one_i2c(struct bbc_i2c_bus *bp) +static void reset_one_i2c(struct bbc_i2c_bus *bp) { writeb(I2C_PCF_PIN, bp->i2c_control_regs + 0x0); writeb(bp->own, bp->i2c_control_regs + 0x1); @@ -291,7 +291,7 @@ static void __init reset_one_i2c(struct bbc_i2c_bus *bp) writeb(I2C_PCF_IDLE, bp->i2c_control_regs + 0x0); } -static struct bbc_i2c_bus * __init attach_one_i2c(struct platform_device *op, int index) +static struct bbc_i2c_bus * attach_one_i2c(struct platform_device *op, int index) { struct bbc_i2c_bus *bp; struct device_node *dp; |
