diff --git a/[refs] b/[refs] index 46c917e1e516..f184092d130b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8e2c83769000e00287c0e6fabd51dc695b23af5 +refs/heads/master: fa38126b51d05ebaeeb14e6724c86d4fb08a52a5 diff --git a/trunk/drivers/staging/comedi/drivers/comedi_bond.c b/trunk/drivers/staging/comedi/drivers/comedi_bond.c index e6ac27dd4498..6b516edfe52e 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_bond.c +++ b/trunk/drivers/staging/comedi/drivers/comedi_bond.c @@ -59,8 +59,6 @@ Configuration Options: /* The maxiumum number of channels per subdevice. */ #define MAX_CHANS 256 -#define MODULE_NAME "comedi_bond" - struct BondedDevice { struct comedi_device *dev; unsigned minor; @@ -374,7 +372,7 @@ static struct comedi_driver bonding_driver = { module_comedi_driver(bonding_driver); MODULE_AUTHOR("Calin A. Culianu"); -MODULE_DESCRIPTION(MODULE_NAME "A driver for COMEDI to bond multiple COMEDI " +MODULE_DESCRIPTION("comedi_bond: A driver for COMEDI to bond multiple COMEDI " "devices together as one. In the words of John Lennon: " "'And the world will live as one...'"); MODULE_LICENSE("GPL");