---

yaml --- r: 175041 b: refs/heads/master c: e20aea6 h: refs/heads/master i: 175039: ec16a5f v: v3
git-mirror · Dec 11, 2009 · bc07774 · bc07774
1 parent 69a4a98
commit bc07774
Show file tree

Hide file tree

Showing 113 changed files with 2 additions and 101,237 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e44fd1cfded0e42c681ad5419b1ceea600ead29d
+refs/heads/master: e20aea64e160d5873c2aaf62cc255ea81ce000eb
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -65,8 +65,6 @@ source "drivers/staging/rt2860/Kconfig"
 
 source "drivers/staging/rt2870/Kconfig"
 
-source "drivers/staging/rt3090/Kconfig"
-
 source "drivers/staging/comedi/Kconfig"
 
 source "drivers/staging/asus_oled/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_POCH)		+= poch/
 obj-$(CONFIG_OTUS)		+= otus/
 obj-$(CONFIG_RT2860)		+= rt2860/
 obj-$(CONFIG_RT2870)		+= rt2870/
-obj-$(CONFIG_RT3090)		+= rt3090/
 obj-$(CONFIG_COMEDI)		+= comedi/
 obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
 obj-$(CONFIG_PANEL)		+= panel/

diff --git a/trunk/drivers/staging/rt2860/pci_main_dev.c b/trunk/drivers/staging/rt2860/pci_main_dev.c
@@ -44,6 +44,7 @@
 MODULE_AUTHOR("Jett Chen <jett_chen@ralinktech.com>");
 MODULE_DESCRIPTION("RT2860/RT3090 Wireless Lan Linux Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("rt3090sta");
 
 //
 // Function declarations

diff --git a/trunk/drivers/staging/rt3090/Kconfig b/trunk/drivers/staging/rt3090/Kconfig
diff --git a/trunk/drivers/staging/rt3090/Makefile b/trunk/drivers/staging/rt3090/Makefile
diff --git a/trunk/drivers/staging/rt3090/action.h b/trunk/drivers/staging/rt3090/action.h