From fcdf68a38bb6e50e62b6de422734b88a28110e3e Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Fri, 23 Nov 2012 10:09:03 +0100 Subject: [PATCH] --- yaml --- r: 347083 b: refs/heads/master c: 5f433819b3ee4d8603f834e1438462c4ad58b185 h: refs/heads/master i: 347081: 6c2577fe13987148327fb8f18ecde86a5f1b7ad6 347079: f816fccd598dfc32dd680a69a9a3391869792559 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 023883d6050f..da1dd63d6aa8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd32e6ccdda15be1bf5b1b0a52631b06bb243d9e +refs/heads/master: 5f433819b3ee4d8603f834e1438462c4ad58b185 diff --git a/trunk/drivers/i2c/busses/i2c-at91.c b/trunk/drivers/i2c/busses/i2c-at91.c index 511bd756f280..4f7577f23142 100644 --- a/trunk/drivers/i2c/busses/i2c-at91.c +++ b/trunk/drivers/i2c/busses/i2c-at91.c @@ -66,24 +66,24 @@ #define AT91_TWI_THR 0x0034 /* Transmit Holding Register */ struct at91_twi_pdata { - unsigned clk_max_div; - unsigned clk_offset; - bool has_unre_flag; + unsigned clk_max_div; + unsigned clk_offset; + bool has_unre_flag; }; struct at91_twi_dev { - struct device *dev; - void __iomem *base; - struct completion cmd_complete; - struct clk *clk; - u8 *buf; - size_t buf_len; - struct i2c_msg *msg; - int irq; - unsigned transfer_status; - struct i2c_adapter adapter; - unsigned twi_cwgr_reg; - struct at91_twi_pdata *pdata; + struct device *dev; + void __iomem *base; + struct completion cmd_complete; + struct clk *clk; + u8 *buf; + size_t buf_len; + struct i2c_msg *msg; + int irq; + unsigned transfer_status; + struct i2c_adapter adapter; + unsigned twi_cwgr_reg; + struct at91_twi_pdata *pdata; }; static unsigned at91_twi_read(struct at91_twi_dev *dev, unsigned reg)