diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/ieee1394 | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/Config.in | 3 | ||||
| -rw-r--r-- | drivers/ieee1394/aic5800.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/raw1394.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ieee1394/Config.in b/drivers/ieee1394/Config.in index bdb3002d2..a0c340ba2 100644 --- a/drivers/ieee1394/Config.in +++ b/drivers/ieee1394/Config.in @@ -14,7 +14,8 @@ if [ "$CONFIG_PCI" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then bool ' Support for non-IEEE1394 local ports' CONFIG_IEEE1394_PCILYNX_PORTS fi - dep_tristate 'Adaptec AIC-5800 (AHA-89xx) support' CONFIG_IEEE1394_AIC5800 $CONFIG_IEEE1394 +# this driver is unsupported now: +# dep_tristate 'Adaptec AIC-5800 (AHA-89xx) support' CONFIG_IEEE1394_AIC5800 $CONFIG_IEEE1394 dep_tristate 'OHCI (Open Host Controller Interface) support' CONFIG_IEEE1394_OHCI1394 $CONFIG_IEEE1394 dep_tristate 'Video1394 support' CONFIG_IEEE1394_VIDEO1394 $CONFIG_IEEE1394_OHCI1394 diff --git a/drivers/ieee1394/aic5800.c b/drivers/ieee1394/aic5800.c index 2748c21b6..1b649de5e 100644 --- a/drivers/ieee1394/aic5800.c +++ b/drivers/ieee1394/aic5800.c @@ -1,4 +1,6 @@ /* + * +++ THIS DRIVER IS ORPHANED AND UNSUPPORTED +++ + * * aic5800.c - Adaptec AIC-5800 PCI-IEEE1394 chip driver * Copyright (C)1999 Emanuel Pirker <epirker@edu.uni-klu.ac.at> * diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index d10353855..8b4aa7244 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c @@ -42,13 +42,13 @@ #endif -static devfs_handle_t devfs_handle = NULL; +static devfs_handle_t devfs_handle; LIST_HEAD(host_info_list); -static int host_count = 0; +static int host_count; spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED; -static struct hpsb_highlevel *hl_handle = NULL; +static struct hpsb_highlevel *hl_handle; static atomic_t iso_buffer_size; static const int iso_buffer_max = 4 * 1024 * 1024; /* 4 MB */ |