From b97d3a0f5af3af01657bfe654de86ec4c31526b2 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Fri, 31 Oct 2008 13:35:21 +0000 Subject: [PATCH] --- yaml --- r: 121823 b: refs/heads/master c: b2e53b338b7b4608372d070bb477f3bae3971e5a h: refs/heads/master i: 121821: 8ce5358e6a6900beca2af334c574c09608d388f5 121819: 22e4667838290e4ff1e9f57221befd98b67ce0bb 121815: e066f7c10cde269c1ff108247adf19d0fc71dd5d 121807: 2527e04057ee4e82b90cca84bfd19126e82682db 121791: cd1d2a5bbf884be984bcf0ab7d946555906d2fc4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/Makefile | 9 +-------- trunk/drivers/net/wireless/orinoco/Makefile | 12 ++++++++++++ trunk/drivers/net/wireless/{ => orinoco}/airport.c | 0 trunk/drivers/net/wireless/{ => orinoco}/hermes.c | 0 trunk/drivers/net/wireless/{ => orinoco}/hermes.h | 0 .../drivers/net/wireless/{ => orinoco}/hermes_dld.c | 0 .../drivers/net/wireless/{ => orinoco}/hermes_dld.h | 0 .../drivers/net/wireless/{ => orinoco}/hermes_rid.h | 0 trunk/drivers/net/wireless/{ => orinoco}/orinoco.c | 0 trunk/drivers/net/wireless/{ => orinoco}/orinoco.h | 0 .../drivers/net/wireless/{ => orinoco}/orinoco_cs.c | 0 .../net/wireless/{ => orinoco}/orinoco_nortel.c | 0 .../drivers/net/wireless/{ => orinoco}/orinoco_pci.c | 0 .../drivers/net/wireless/{ => orinoco}/orinoco_pci.h | 0 .../drivers/net/wireless/{ => orinoco}/orinoco_plx.c | 0 .../drivers/net/wireless/{ => orinoco}/orinoco_tmd.c | 0 .../drivers/net/wireless/{ => orinoco}/spectrum_cs.c | 0 18 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 trunk/drivers/net/wireless/orinoco/Makefile rename trunk/drivers/net/wireless/{ => orinoco}/airport.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/hermes.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/hermes.h (100%) rename trunk/drivers/net/wireless/{ => orinoco}/hermes_dld.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/hermes_dld.h (100%) rename trunk/drivers/net/wireless/{ => orinoco}/hermes_rid.h (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco.h (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_cs.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_nortel.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_pci.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_pci.h (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_plx.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/orinoco_tmd.c (100%) rename trunk/drivers/net/wireless/{ => orinoco}/spectrum_cs.c (100%) diff --git a/[refs] b/[refs] index 2018c396cbd9..f39f27d92631 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5166ccd220f187b2e9edfc5f01eb49f4a0ebf586 +refs/heads/master: b2e53b338b7b4608372d070bb477f3bae3971e5a diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/drivers/net/wireless/Makefile index 59d2d805f60b..78820840fe21 100644 --- a/trunk/drivers/net/wireless/Makefile +++ b/trunk/drivers/net/wireless/Makefile @@ -16,14 +16,7 @@ obj-$(CONFIG_WAVELAN) += wavelan.o obj-$(CONFIG_PCMCIA_NETWAVE) += netwave_cs.o obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan_cs.o -obj-$(CONFIG_HERMES) += orinoco.o hermes.o hermes_dld.o -obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o -obj-$(CONFIG_APPLE_AIRPORT) += airport.o -obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o -obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o -obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o -obj-$(CONFIG_NORTEL_HERMES) += orinoco_nortel.o -obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o +obj-$(CONFIG_HERMES) += orinoco/ obj-$(CONFIG_AIRO) += airo.o obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o diff --git a/trunk/drivers/net/wireless/orinoco/Makefile b/trunk/drivers/net/wireless/orinoco/Makefile new file mode 100644 index 000000000000..791366e08c50 --- /dev/null +++ b/trunk/drivers/net/wireless/orinoco/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for the orinoco wireless device drivers. +# + +obj-$(CONFIG_HERMES) += orinoco.o hermes.o hermes_dld.o +obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o +obj-$(CONFIG_APPLE_AIRPORT) += airport.o +obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o +obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o +obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o +obj-$(CONFIG_NORTEL_HERMES) += orinoco_nortel.o +obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o diff --git a/trunk/drivers/net/wireless/airport.c b/trunk/drivers/net/wireless/orinoco/airport.c similarity index 100% rename from trunk/drivers/net/wireless/airport.c rename to trunk/drivers/net/wireless/orinoco/airport.c diff --git a/trunk/drivers/net/wireless/hermes.c b/trunk/drivers/net/wireless/orinoco/hermes.c similarity index 100% rename from trunk/drivers/net/wireless/hermes.c rename to trunk/drivers/net/wireless/orinoco/hermes.c diff --git a/trunk/drivers/net/wireless/hermes.h b/trunk/drivers/net/wireless/orinoco/hermes.h similarity index 100% rename from trunk/drivers/net/wireless/hermes.h rename to trunk/drivers/net/wireless/orinoco/hermes.h diff --git a/trunk/drivers/net/wireless/hermes_dld.c b/trunk/drivers/net/wireless/orinoco/hermes_dld.c similarity index 100% rename from trunk/drivers/net/wireless/hermes_dld.c rename to trunk/drivers/net/wireless/orinoco/hermes_dld.c diff --git a/trunk/drivers/net/wireless/hermes_dld.h b/trunk/drivers/net/wireless/orinoco/hermes_dld.h similarity index 100% rename from trunk/drivers/net/wireless/hermes_dld.h rename to trunk/drivers/net/wireless/orinoco/hermes_dld.h diff --git a/trunk/drivers/net/wireless/hermes_rid.h b/trunk/drivers/net/wireless/orinoco/hermes_rid.h similarity index 100% rename from trunk/drivers/net/wireless/hermes_rid.h rename to trunk/drivers/net/wireless/orinoco/hermes_rid.h diff --git a/trunk/drivers/net/wireless/orinoco.c b/trunk/drivers/net/wireless/orinoco/orinoco.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco.c rename to trunk/drivers/net/wireless/orinoco/orinoco.c diff --git a/trunk/drivers/net/wireless/orinoco.h b/trunk/drivers/net/wireless/orinoco/orinoco.h similarity index 100% rename from trunk/drivers/net/wireless/orinoco.h rename to trunk/drivers/net/wireless/orinoco/orinoco.h diff --git a/trunk/drivers/net/wireless/orinoco_cs.c b/trunk/drivers/net/wireless/orinoco/orinoco_cs.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco_cs.c rename to trunk/drivers/net/wireless/orinoco/orinoco_cs.c diff --git a/trunk/drivers/net/wireless/orinoco_nortel.c b/trunk/drivers/net/wireless/orinoco/orinoco_nortel.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco_nortel.c rename to trunk/drivers/net/wireless/orinoco/orinoco_nortel.c diff --git a/trunk/drivers/net/wireless/orinoco_pci.c b/trunk/drivers/net/wireless/orinoco/orinoco_pci.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco_pci.c rename to trunk/drivers/net/wireless/orinoco/orinoco_pci.c diff --git a/trunk/drivers/net/wireless/orinoco_pci.h b/trunk/drivers/net/wireless/orinoco/orinoco_pci.h similarity index 100% rename from trunk/drivers/net/wireless/orinoco_pci.h rename to trunk/drivers/net/wireless/orinoco/orinoco_pci.h diff --git a/trunk/drivers/net/wireless/orinoco_plx.c b/trunk/drivers/net/wireless/orinoco/orinoco_plx.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco_plx.c rename to trunk/drivers/net/wireless/orinoco/orinoco_plx.c diff --git a/trunk/drivers/net/wireless/orinoco_tmd.c b/trunk/drivers/net/wireless/orinoco/orinoco_tmd.c similarity index 100% rename from trunk/drivers/net/wireless/orinoco_tmd.c rename to trunk/drivers/net/wireless/orinoco/orinoco_tmd.c diff --git a/trunk/drivers/net/wireless/spectrum_cs.c b/trunk/drivers/net/wireless/orinoco/spectrum_cs.c similarity index 100% rename from trunk/drivers/net/wireless/spectrum_cs.c rename to trunk/drivers/net/wireless/orinoco/spectrum_cs.c