Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / misc / eeprom_93cx6.c

diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c
index ac515b0ef67c9d190dbb96e91284b96b6c85a33a..15b1780025c84e75c24b83ca0ce6dbab6336dc0b 100644 (file)
--- a/drivers/misc/eeprom_93cx6.c
+++ b/drivers/misc/eeprom_93cx6.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/eeprom_93cx6.h>
 
@@ -55,10 +54,10 @@ static inline void eeprom_93cx6_pulse_low(struct eeprom_93cx6 *eeprom)
 
        /*
         * Add a short delay for the pulse to work.
-        * According to the specifications the minimal time
-        * should be 450ns so a 1us delay is sufficient.
+        * According to the specifications the "maximum minimum"
+        * time should be 450ns.
         */
-       udelay(1);
+       ndelay(450);
 }
 
 static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)