diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
| commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
| tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /include/asm-s390/kvm_virtio.h | |
| parent | 2c3abab7c95295f319dc8899b74cbd60140fcdfb (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
| download | talos-op-linux-15d3b4a26291c170563e2b25ded5de1324f93959.tar.gz talos-op-linux-15d3b4a26291c170563e2b25ded5de1324f93959.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-s390/kvm_virtio.h')
| -rw-r--r-- | include/asm-s390/kvm_virtio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-s390/kvm_virtio.h b/include/asm-s390/kvm_virtio.h index 5c871a990c29..146100224def 100644 --- a/include/asm-s390/kvm_virtio.h +++ b/include/asm-s390/kvm_virtio.h @@ -50,4 +50,14 @@ struct kvm_vqconfig { #define KVM_S390_VIRTIO_RESET 1 #define KVM_S390_VIRTIO_SET_STATUS 2 +#ifdef __KERNEL__ +/* early virtio console setup */ +#ifdef CONFIG_VIRTIO_CONSOLE +extern void s390_virtio_console_init(void); +#else +static inline void s390_virtio_console_init(void) +{ +} +#endif /* CONFIG_VIRTIO_CONSOLE */ +#endif /* __KERNEL__ */ #endif |
