Merge branches 'release' and 'dmi' into release

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / smctr_firmware.h

diff --git a/drivers/net/tokenring/smctr_firmware.h b/drivers/net/tokenring/smctr_firmware.h
index 48994b043b7cf0e06e29b2f4424257edfae107b5..292e50ddf01a58c095a8285647ca6d951ff59c18 100644 (file)
--- a/drivers/net/tokenring/smctr_firmware.h
+++ b/drivers/net/tokenring/smctr_firmware.h
@@ -17,7 +17,6 @@
  *  - Jay Schulist <jschlst@samba.org>
  */
 
-#include <linux/config.h>
 
 #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE)