[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / at1700.c

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 2d4b5c3..72ea6e3 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -899,15 +899,3 @@ module_init(at1700_module_init);
 module_exit(at1700_module_exit);
 #endif /* MODULE */
 MODULE_LICENSE("GPL");
-
-
-/*
- * Local variables:
- *  compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -c at1700.c"
- *  alt-compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -c at1700.c"
- *  tab-width: 4
- *  c-basic-offset: 4
- *  c-indent-level: 4
- * End:
- */
-