diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/char/ftape/zftape/Makefile | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/char/ftape/zftape/Makefile')
| -rw-r--r-- | drivers/char/ftape/zftape/Makefile | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/char/ftape/zftape/Makefile b/drivers/char/ftape/zftape/Makefile deleted file mode 100644 index 6d91c1f77c05..000000000000 --- a/drivers/char/ftape/zftape/Makefile +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Copyright (C) 1996, 1997 Claus-Justus Heine. | ||
| 3 | # | ||
| 4 | # This program is free software; you can redistribute it and/or modify | ||
| 5 | # it under the terms of the GNU General Public License as published by | ||
| 6 | # the Free Software Foundation; either version 2, or (at your option) | ||
| 7 | # any later version. | ||
| 8 | # | ||
| 9 | # This program is distributed in the hope that it will be useful, | ||
| 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | # GNU General Public License for more details. | ||
| 13 | # | ||
| 14 | # You should have received a copy of the GNU General Public License | ||
| 15 | # along with this program; see the file COPYING. If not, write to | ||
| 16 | # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 17 | # | ||
| 18 | # $Source: /homes/cvs/ftape-stacked/ftape/zftape/Makefile,v $ | ||
| 19 | # $Revision: 1.4 $ | ||
| 20 | # $Date: 1997/10/05 19:18:58 $ | ||
| 21 | # | ||
| 22 | # Makefile for the QIC-40/80/3010/3020 zftape interface VFS to | ||
| 23 | # ftape | ||
| 24 | # | ||
| 25 | |||
| 26 | |||
| 27 | # ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should | ||
| 28 | # leave this enabled for compatibility with taper. | ||
| 29 | |||
| 30 | obj-$(CONFIG_ZFTAPE) += zftape.o | ||
| 31 | |||
| 32 | zftape-objs := zftape-rw.o zftape-ctl.o zftape-read.o \ | ||
| 33 | zftape-write.o zftape-vtbl.o zftape-eof.o \ | ||
| 34 | zftape-init.o zftape-buffers.o zftape_syms.o | ||
| 35 | |||
| 36 | EXTRA_CFLAGS := -DZFT_OBSOLETE | ||