aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2011-01-30 16:14:49 -0500
committerMarc Kleine-Budde <mkl@pengutronix.de>2011-06-06 05:00:09 -0400
commit44d856665789288859b7aa47ca25933c1c6ab57d (patch)
tree8e8431015f6f54b1b7261e7077f5985414116343 /drivers
parente3cc055c18ab575291acf0af7622a2e97c4728fa (diff)
can: at91_can: don't align struct definitions
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/can/at91_can.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 74efb5a2ad41..8f15ae4c719f 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -157,21 +157,21 @@ enum at91_mb_mode {
157#define AT91_IRQ_ALL (0x1fffffff) 157#define AT91_IRQ_ALL (0x1fffffff)
158 158
159struct at91_priv { 159struct at91_priv {
160 struct can_priv can; /* must be the first member! */ 160 struct can_priv can; /* must be the first member! */
161 struct net_device *dev; 161 struct net_device *dev;
162 struct napi_struct napi; 162 struct napi_struct napi;
163 163
164 void __iomem *reg_base; 164 void __iomem *reg_base;
165 165
166 u32 reg_sr; 166 u32 reg_sr;
167 unsigned int tx_next; 167 unsigned int tx_next;
168 unsigned int tx_echo; 168 unsigned int tx_echo;
169 unsigned int rx_next; 169 unsigned int rx_next;
170 170
171 struct clk *clk; 171 struct clk *clk;
172 struct at91_can_data *pdata; 172 struct at91_can_data *pdata;
173 173
174 canid_t mb0_id; 174 canid_t mb0_id;
175}; 175};
176 176
177static struct can_bittiming_const at91_bittiming_const = { 177static struct can_bittiming_const at91_bittiming_const = {
@@ -271,7 +271,7 @@ static void at91_setup_mailboxes(struct net_device *dev)
271 271
272 /* reset acceptance mask and id register */ 272 /* reset acceptance mask and id register */
273 for (i = AT91_MB_RX_FIRST; i <= AT91_MB_RX_LAST; i++) { 273 for (i = AT91_MB_RX_FIRST; i <= AT91_MB_RX_LAST; i++) {
274 at91_write(priv, AT91_MAM(i), 0x0 ); 274 at91_write(priv, AT91_MAM(i), 0x0);
275 at91_write(priv, AT91_MID(i), AT91_MID_MIDE); 275 at91_write(priv, AT91_MID(i), AT91_MID_MIDE);
276 } 276 }
277 277
@@ -1231,11 +1231,11 @@ static int __devexit at91_can_remove(struct platform_device *pdev)
1231} 1231}
1232 1232
1233static struct platform_driver at91_can_driver = { 1233static struct platform_driver at91_can_driver = {
1234 .probe = at91_can_probe, 1234 .probe = at91_can_probe,
1235 .remove = __devexit_p(at91_can_remove), 1235 .remove = __devexit_p(at91_can_remove),
1236 .driver = { 1236 .driver = {
1237 .name = KBUILD_MODNAME, 1237 .name = KBUILD_MODNAME,
1238 .owner = THIS_MODULE, 1238 .owner = THIS_MODULE,
1239 }, 1239 },
1240}; 1240};
1241 1241