diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 16:59:24 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 16:59:24 +0400 |
| commit | cda390bb8f0fc751194ef5f4c691ca8d3ff91009 (patch) | |
| tree | 9739758690c5107b73a09f632ae2f8fc2507db09 /drivers/s390/char/Makefile | |
| parent | 9a2c33a422d60e8e55c5aff6752522dc39993b16 (diff) | |
| parent | 449fd15fbcde239875031d70fd06abb4a0e1ed09 (diff) | |
| download | linux-cda390bb8f0fc751194ef5f4c691ca8d3ff91009.tar.xz | |
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'drivers/s390/char/Makefile')
| -rw-r--r-- | drivers/s390/char/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index 629fcc275e92..78b6ace7edcb 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o obj-$(CONFIG_SCLP_ASYNC) += sclp_async.o -obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o obj-$(CONFIG_VMCP) += vmcp.o |