diff --git a/[refs] b/[refs]
index d5a6827cd877..e154d4de31d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6afd9f3e819de4795fcd356e5bfad446e4323f2
+refs/heads/master: 282361a046edd9d58a134f358a3f65a7cb8655d9
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 1eaeda66a525..e39337a1b958 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3423,7 +3423,7 @@ M:	Jiri Kosina <jkosina@suse.cz>
 M:	David Sterba <dsterba@suse.cz>
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-F:	drivers/char/pcmcia/ipwireless/
+F:	drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
 M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
diff --git a/trunk/drivers/tty/Makefile b/trunk/drivers/tty/Makefile
index e549da348a04..690522fcb338 100644
--- a/trunk/drivers/tty/Makefile
+++ b/trunk/drivers/tty/Makefile
@@ -24,3 +24,5 @@ obj-$(CONFIG_ROCKETPORT)	+= rocket.o
 obj-$(CONFIG_SYNCLINK_GT)	+= synclink_gt.o
 obj-$(CONFIG_SYNCLINKMP)	+= synclinkmp.o
 obj-$(CONFIG_SYNCLINK)		+= synclink.o
+
+obj-y += ipwireless/
diff --git a/trunk/drivers/char/pcmcia/ipwireless/Makefile b/trunk/drivers/tty/ipwireless/Makefile
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/Makefile
rename to trunk/drivers/tty/ipwireless/Makefile
diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.c b/trunk/drivers/tty/ipwireless/hardware.c
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/hardware.c
rename to trunk/drivers/tty/ipwireless/hardware.c
diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.h b/trunk/drivers/tty/ipwireless/hardware.h
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/hardware.h
rename to trunk/drivers/tty/ipwireless/hardware.h
diff --git a/trunk/drivers/char/pcmcia/ipwireless/main.c b/trunk/drivers/tty/ipwireless/main.c
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/main.c
rename to trunk/drivers/tty/ipwireless/main.c
diff --git a/trunk/drivers/char/pcmcia/ipwireless/main.h b/trunk/drivers/tty/ipwireless/main.h
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/main.h
rename to trunk/drivers/tty/ipwireless/main.h
diff --git a/trunk/drivers/char/pcmcia/ipwireless/network.c b/trunk/drivers/tty/ipwireless/network.c
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/network.c
rename to trunk/drivers/tty/ipwireless/network.c
diff --git a/trunk/drivers/char/pcmcia/ipwireless/network.h b/trunk/drivers/tty/ipwireless/network.h
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/network.h
rename to trunk/drivers/tty/ipwireless/network.h
diff --git a/trunk/drivers/char/pcmcia/ipwireless/setup_protocol.h b/trunk/drivers/tty/ipwireless/setup_protocol.h
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/setup_protocol.h
rename to trunk/drivers/tty/ipwireless/setup_protocol.h
diff --git a/trunk/drivers/char/pcmcia/ipwireless/tty.c b/trunk/drivers/tty/ipwireless/tty.c
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/tty.c
rename to trunk/drivers/tty/ipwireless/tty.c
diff --git a/trunk/drivers/char/pcmcia/ipwireless/tty.h b/trunk/drivers/tty/ipwireless/tty.h
similarity index 100%
rename from trunk/drivers/char/pcmcia/ipwireless/tty.h
rename to trunk/drivers/tty/ipwireless/tty.h