diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
| commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
| tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /drivers/net/lp486e.c | |
| parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
| parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/net/lp486e.c')
| -rw-r--r-- | drivers/net/lp486e.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 6139f06d7d2b..94d5ea1ce8bd 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
| @@ -56,8 +56,6 @@ PORT SIZE ACTION MEANING | |||
| 56 | All other communication is through memory! | 56 | All other communication is through memory! |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #define SLOW_DOWN_IO udelay(5) | ||
| 60 | |||
| 61 | #include <linux/module.h> | 59 | #include <linux/module.h> |
| 62 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 63 | #include <linux/delay.h> | 61 | #include <linux/delay.h> |