diff options
author | David Kilroy <kilroyd@googlemail.com> | 2009-02-04 18:05:48 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-11 11:44:27 -0500 |
commit | 47445cb95015bef0d54ca799f31e454797378a71 (patch) | |
tree | e77ff21e2ff91edd8931b07379360e4c09341654 /drivers/net/wireless/orinoco | |
parent | 2131266d6e53e8f84f8111323036343d72bcb856 (diff) |
orinoco: Rename orinoco.c
So that we can split up the file and still produce a module named
orinoco.o.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r-- | drivers/net/wireless/orinoco/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/airport.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/main.c (renamed from drivers/net/wireless/orinoco/orinoco.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_pci.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_tmd.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 4 |
7 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/orinoco/Makefile b/drivers/net/wireless/orinoco/Makefile index 791366e08c50..d2ac78559728 100644 --- a/drivers/net/wireless/orinoco/Makefile +++ b/drivers/net/wireless/orinoco/Makefile | |||
@@ -1,6 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the orinoco wireless device drivers. | 2 | # Makefile for the orinoco wireless device drivers. |
3 | # | 3 | # |
4 | orinoco-objs := main.o | ||
4 | 5 | ||
5 | obj-$(CONFIG_HERMES) += orinoco.o hermes.o hermes_dld.o | 6 | obj-$(CONFIG_HERMES) += orinoco.o hermes.o hermes_dld.o |
6 | obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o | 7 | obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o |
diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c index 5582dca9f7f5..8c4065f1b0d0 100644 --- a/drivers/net/wireless/orinoco/airport.c +++ b/drivers/net/wireless/orinoco/airport.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * A driver for "Hermes" chipset based Apple Airport wireless | 3 | * A driver for "Hermes" chipset based Apple Airport wireless |
4 | * card. | 4 | * card. |
5 | * | 5 | * |
6 | * Copyright notice & release notes in file orinoco.c | 6 | * Copyright notice & release notes in file main.c |
7 | * | 7 | * |
8 | * Note specific to airport stub: | 8 | * Note specific to airport stub: |
9 | * | 9 | * |
diff --git a/drivers/net/wireless/orinoco/orinoco.c b/drivers/net/wireless/orinoco/main.c index 1544effd95e3..e43e3e20df94 100644 --- a/drivers/net/wireless/orinoco/orinoco.c +++ b/drivers/net/wireless/orinoco/main.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* orinoco.c - (formerly known as dldwd_cs.c and orinoco_cs.c) | 1 | /* main.c - (formerly known as dldwd_cs.c, orinoco_cs.c and orinoco.c) |
2 | * | 2 | * |
3 | * A driver for Hermes or Prism 2 chipset based PCMCIA wireless | 3 | * A driver for Hermes or Prism 2 chipset based PCMCIA wireless |
4 | * adaptors, with Lucent/Agere, Intersil or Symbol firmware. | 4 | * adaptors, with Lucent/Agere, Intersil or Symbol firmware. |
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index d194b3e0311d..b381aed24d73 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Linksys, D-Link and Farallon Skyline. It should also work on Symbol | 7 | * Linksys, D-Link and Farallon Skyline. It should also work on Symbol |
8 | * cards such as the 3Com AirConnect and Ericsson WLAN. | 8 | * cards such as the 3Com AirConnect and Ericsson WLAN. |
9 | * | 9 | * |
10 | * Copyright notice & release notes in file orinoco.c | 10 | * Copyright notice & release notes in file main.c |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #define DRIVER_NAME "orinoco_cs" | 13 | #define DRIVER_NAME "orinoco_cs" |
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.h b/drivers/net/wireless/orinoco/orinoco_pci.h index 88df3ee98078..c655b4a3de16 100644 --- a/drivers/net/wireless/orinoco/orinoco_pci.h +++ b/drivers/net/wireless/orinoco/orinoco_pci.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * both native PCI and PCMCIA-to-PCI bridges. | 4 | * both native PCI and PCMCIA-to-PCI bridges. |
5 | * | 5 | * |
6 | * Copyright (C) 2005, Pavel Roskin. | 6 | * Copyright (C) 2005, Pavel Roskin. |
7 | * See orinoco.c for license. | 7 | * See main.c for license. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef _ORINOCO_PCI_H | 10 | #ifndef _ORINOCO_PCI_H |
diff --git a/drivers/net/wireless/orinoco/orinoco_tmd.c b/drivers/net/wireless/orinoco/orinoco_tmd.c index e77c4042d43a..cda0e6e4d7a1 100644 --- a/drivers/net/wireless/orinoco/orinoco_tmd.c +++ b/drivers/net/wireless/orinoco/orinoco_tmd.c | |||
@@ -27,7 +27,7 @@ | |||
27 | * provisions above, a recipient may use your version of this file | 27 | * provisions above, a recipient may use your version of this file |
28 | * under either the MPL or the GPL. | 28 | * under either the MPL or the GPL. |
29 | * | 29 | * |
30 | * The actual driving is done by orinoco.c, this is just resource | 30 | * The actual driving is done by main.c, this is just resource |
31 | * allocation stuff. | 31 | * allocation stuff. |
32 | * | 32 | * |
33 | * This driver is modeled after the orinoco_plx driver. The main | 33 | * This driver is modeled after the orinoco_plx driver. The main |
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 9aefe19dbac2..38e5198e44c7 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Communications and Intel PRO/Wireless 2011B. | 4 | * Communications and Intel PRO/Wireless 2011B. |
5 | * | 5 | * |
6 | * The driver implements Symbol firmware download. The rest is handled | 6 | * The driver implements Symbol firmware download. The rest is handled |
7 | * in hermes.c and orinoco.c. | 7 | * in hermes.c and main.c. |
8 | * | 8 | * |
9 | * Utilities for downloading the Symbol firmware are available at | 9 | * Utilities for downloading the Symbol firmware are available at |
10 | * http://sourceforge.net/projects/orinoco/ | 10 | * http://sourceforge.net/projects/orinoco/ |
@@ -15,7 +15,7 @@ | |||
15 | * Portions based on Spectrum24tDnld.c from original spectrum24 driver: | 15 | * Portions based on Spectrum24tDnld.c from original spectrum24 driver: |
16 | * Copyright (C) Symbol Technologies. | 16 | * Copyright (C) Symbol Technologies. |
17 | * | 17 | * |
18 | * See copyright notice in file orinoco.c. | 18 | * See copyright notice in file main.c. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define DRIVER_NAME "spectrum_cs" | 21 | #define DRIVER_NAME "spectrum_cs" |