diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 2 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/Makefile (renamed from drivers/char/pcmcia/ipwireless/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/hardware.c (renamed from drivers/char/pcmcia/ipwireless/hardware.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/hardware.h (renamed from drivers/char/pcmcia/ipwireless/hardware.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/main.c (renamed from drivers/char/pcmcia/ipwireless/main.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/main.h (renamed from drivers/char/pcmcia/ipwireless/main.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/network.c (renamed from drivers/char/pcmcia/ipwireless/network.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/network.h (renamed from drivers/char/pcmcia/ipwireless/network.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/setup_protocol.h (renamed from drivers/char/pcmcia/ipwireless/setup_protocol.h) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/tty.c (renamed from drivers/char/pcmcia/ipwireless/tty.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/tty.h (renamed from drivers/char/pcmcia/ipwireless/tty.h) | 0 |
12 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1eaeda66a525..e39337a1b958 100644 --- a/MAINTAINERS +++ b/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/drivers/tty/Makefile b/drivers/tty/Makefile index e549da348a04..690522fcb338 100644 --- a/drivers/tty/Makefile +++ b/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/drivers/char/pcmcia/ipwireless/Makefile b/drivers/tty/ipwireless/Makefile index db80873d7f20..db80873d7f20 100644 --- a/drivers/char/pcmcia/ipwireless/Makefile +++ b/drivers/tty/ipwireless/Makefile diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index 0aeb5a38d296..0aeb5a38d296 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/tty/ipwireless/hardware.h index 90a8590e43b0..90a8590e43b0 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.h +++ b/drivers/tty/ipwireless/hardware.h diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/tty/ipwireless/main.c index 94b8eb4d691d..94b8eb4d691d 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/tty/ipwireless/main.c diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/tty/ipwireless/main.h index f2cbb116bccb..f2cbb116bccb 100644 --- a/drivers/char/pcmcia/ipwireless/main.h +++ b/drivers/tty/ipwireless/main.h diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/tty/ipwireless/network.c index f7daeea598e4..f7daeea598e4 100644 --- a/drivers/char/pcmcia/ipwireless/network.c +++ b/drivers/tty/ipwireless/network.c diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/tty/ipwireless/network.h index 561f765b3334..561f765b3334 100644 --- a/drivers/char/pcmcia/ipwireless/network.h +++ b/drivers/tty/ipwireless/network.h diff --git a/drivers/char/pcmcia/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h index 9d6bcc77c73c..9d6bcc77c73c 100644 --- a/drivers/char/pcmcia/ipwireless/setup_protocol.h +++ b/drivers/tty/ipwireless/setup_protocol.h diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c index ef92869502a7..ef92869502a7 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/tty/ipwireless/tty.c diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/tty/ipwireless/tty.h index 747b2d637860..747b2d637860 100644 --- a/drivers/char/pcmcia/ipwireless/tty.h +++ b/drivers/tty/ipwireless/tty.h |