diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /drivers/net/lp486e.c | |
| parent | V4L/DVB (3415): Msp3400-kthreads.c: make 3 functions static (diff) | |
| parent | Linux 2.6.16 (diff) | |
| download | linux-b05005772f34497eb2b7415a651fe785cbe70e16.tar.xz linux-b05005772f34497eb2b7415a651fe785cbe70e16.zip | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
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 All other communication is through memory! */ -#define SLOW_DOWN_IO udelay(5) - #include <linux/module.h> #include <linux/init.h> #include <linux/delay.h> |