Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218378
b: refs/heads/master
c: 00389b0
h: refs/heads/master
v: v3
  • Loading branch information
Marc Kleine-Budde authored and David S. Miller committed Oct 24, 2010
1 parent a2e18a4 commit b1c3f48
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 882055c8387e85cb380ab152b96ff69b570d8989
refs/heads/master: 00389b0820c44cceec3f6981cb4d217982ec73b2
6 changes: 3 additions & 3 deletions trunk/drivers/net/can/at91_can.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

#include <mach/board.h>

#define DRV_NAME "at91_can"
#define AT91_NAPI_WEIGHT 12

/*
Expand Down Expand Up @@ -172,6 +171,7 @@ struct at91_priv {
};

static struct can_bittiming_const at91_bittiming_const = {
.name = KBUILD_MODNAME,
.tseg1_min = 4,
.tseg1_max = 16,
.tseg2_min = 2,
Expand Down Expand Up @@ -1148,7 +1148,7 @@ static struct platform_driver at91_can_driver = {
.probe = at91_can_probe,
.remove = __devexit_p(at91_can_remove),
.driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
},
};
Expand All @@ -1168,4 +1168,4 @@ module_exit(at91_can_module_exit);

MODULE_AUTHOR("Marc Kleine-Budde <mkl@pengutronix.de>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION(DRV_NAME " CAN netdevice driver");
MODULE_DESCRIPTION(KBUILD_MODNAME " CAN netdevice driver");

0 comments on commit b1c3f48

Please sign in to comment.