Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6-omap-h63xx.git] / drivers / net / gianfar_sysfs.c

diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index a6d5c43199cbfa6eeff4336e6d34db6df3ce292d..9dd387fb3d741b1190b88191bc0eae5de92d483f 100644 (file)
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -19,7 +19,6 @@
  * Sysfs file creation and management
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -88,7 +87,7 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev,
        priv->bd_stash_en = new_setting;
 
        temp = gfar_read(&priv->regs->attr);
-       
+
        if (new_setting)
                temp |= ATTR_BDSTASH;
        else