diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 18:29:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 18:29:33 -0400 |
| commit | fd2f261053b2f125d5f6882b6d095ce2f4076fe5 (patch) | |
| tree | 5be548353e3c8b3a7e1e5e01e41b88777ad6d249 /drivers/s390/char/Makefile | |
| parent | 99e1221d1a1edac316f7f8116c781f75733b1159 (diff) | |
| parent | a07a5b336f699e21d405764931a9d5426dc4f945 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix broken logic, SIGA flags must be bitwise ORed
[S390] cio: Dont print trailing \0 in modalias_show().
[S390] Simplify stack trace.
[S390] z/VM unit record device driver
[S390] vmcp cleanup
[S390] qdio: output queue stall on FCP and network devices
[S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions.
[S390] Update default configuration.
Diffstat (limited to 'drivers/s390/char/Makefile')
| -rw-r--r-- | drivers/s390/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index c210784bdf46..130de19916f2 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile | |||
| @@ -29,6 +29,7 @@ obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o | |||
| 29 | obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o | 29 | obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o |
| 30 | obj-$(CONFIG_MONREADER) += monreader.o | 30 | obj-$(CONFIG_MONREADER) += monreader.o |
| 31 | obj-$(CONFIG_MONWRITER) += monwriter.o | 31 | obj-$(CONFIG_MONWRITER) += monwriter.o |
| 32 | obj-$(CONFIG_S390_VMUR) += vmur.o | ||
| 32 | 33 | ||
| 33 | zcore_mod-objs := sclp_sdias.o zcore.o | 34 | zcore_mod-objs := sclp_sdias.o zcore.o |
| 34 | obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o | 35 | obj-$(CONFIG_ZFCPDUMP) += zcore_mod.o |