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

[can-eth-gw-linux.git] / drivers / tty / serial / icom.c

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index a8267956ac886be591998a7472e8a5243aaa8b79..72b6334bcf1aacae37068258ec9d4cbd46e6bf3d 100644 (file)
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -505,7 +505,7 @@ static void load_code(struct icom_port *icom_port)
                /* Stop processor */
                stop_processor(icom_port);
 
-               dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n");
+               dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n");
        }
 
        if (new_page != NULL)
@@ -1596,7 +1596,7 @@ probe_exit0:
        return retval;
 }
 
-static void __devexit icom_remove(struct pci_dev *dev)
+static void icom_remove(struct pci_dev *dev)
 {
        struct icom_adapter *icom_adapter;
        struct list_head *tmp;