diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:05:50 +0100 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /drivers/s390/cio/Makefile | |
| parent | dma-debug: make memory range checks more consistent (diff) | |
| parent | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm... (diff) | |
| download | linux-b0d44c0dbbd52effb731b1c0af9afd56215c48de.tar.xz linux-b0d44c0dbbd52effb731b1c0af9afd56215c48de.zip | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'drivers/s390/cio/Makefile')
| -rw-r--r-- | drivers/s390/cio/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile index bd79bd165396..adb3dd301528 100644 --- a/drivers/s390/cio/Makefile +++ b/drivers/s390/cio/Makefile @@ -3,7 +3,7 @@ # obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o scsw.o \ - fcx.o itcw.o + fcx.o itcw.o crw.o ccw_device-objs += device.o device_fsm.o device_ops.o ccw_device-objs += device_id.o device_pgid.o device_status.o obj-y += ccw_device.o cmf.o |