Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / olpc_dcon / olpc_dcon_xo_1.c

diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index b154be7a2fe64dc513df57de2dc7379086e88d97..22c04eabed4116768959b10681c4c880c0940c7c 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -12,6 +12,7 @@
  */
 #include <linux/cs5535.h>
 #include <linux/gpio.h>
+#include <linux/delay.h>
 #include <asm/olpc.h>
 
 #include "olpc_dcon.h"
@@ -80,7 +81,7 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
        lob &= ~(1 << DCON_IRQ);
        outb(lob, 0x4d0);
 
-       /* Register the interupt handler */
+       /* Register the interrupt handler */
        if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
                printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n");
                goto err_req_irq;