diff --git a/[refs] b/[refs] index 7d09349ec5fe..46c917e1e516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb2a66ff03bff35e960a3a3303562751373418a +refs/heads/master: c8e2c83769000e00287c0e6fabd51dc695b23af5 diff --git a/trunk/drivers/staging/comedi/drivers/comedi_bond.c b/trunk/drivers/staging/comedi/drivers/comedi_bond.c index 1ca939cb83be..e6ac27dd4498 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_bond.c +++ b/trunk/drivers/staging/comedi/drivers/comedi_bond.c @@ -60,10 +60,6 @@ Configuration Options: #define MAX_CHANS 256 #define MODULE_NAME "comedi_bond" -#ifndef STR -# define STR1(x) #x -# define STR(x) STR1(x) -#endif struct BondedDevice { struct comedi_device *dev;