From c12216232bb47bc593ad94791fbde6e4677425b9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 30 Apr 2010 15:31:13 -0700
Subject: [PATCH] --- yaml --- r: 197151 b: refs/heads/master c:
 787ae4e26f3600c7d30693a92e18174a2d6363fc h: refs/heads/master i:   197149:
 1a6c3fc55998d57a78c248852b08e964f75f133e   197147:
 f014d45052f09447ee15f052efb268ed8b8cbb3a   197143:
 6c00612403edc93bffeb34fce084173c3daeaabc   197135:
 ef46e481335084fed2ac0c2d2c9524eabf904ffb   197119:
 583b8176d5e6ddcfc5c0d266d32e4079fba878b3 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/drivers/comedi_bond.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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)