diff --git a/[refs] b/[refs]
index 933badac136e..b69d2dfab8b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf22b64aa7eb2d32c4ff49262b8d26c18bb232a
+refs/heads/master: 787ae4e26f3600c7d30693a92e18174a2d6363fc
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_bond.c b/trunk/drivers/staging/comedi/drivers/comedi_bond.c
index 41311d99473b..4e6797a0b1e2 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_bond.c
@@ -96,9 +96,7 @@ Configuration Options:
 #define MAX_CHANS 256
 
 #define MODULE_NAME "comedi_bond"
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
-#endif
 #ifndef STR
 #  define STR1(x) #x
 #  define STR(x) STR1(x)