Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / tty / isicom.c

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 03c14979accf49f68103c00df3763a28a4598eda..e1235accab740b4bca4eb01c28b0ed76e170ea93 100644 (file)
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -102,7 +102,7 @@
  *     You can find the original tools for this direct from Multitech
  *             ftp://ftp.multitech.com/ISI-Cards/
  *
- *     Having installed the cards the module options (/etc/modprobe.conf)
+ *     Having installed the cards the module options (/etc/modprobe.d/)
  *
  *     options isicom   io=card1,card2,card3,card4 irq=card1,card2,card3,card4
  *
@@ -133,7 +133,6 @@
 
 #include <linux/uaccess.h>
 #include <linux/io.h>
-#include <asm/system.h>
 
 #include <linux/pci.h>