Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / s390 / char / zcore.c

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 1bbae43..c431198 100644 (file)
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -275,7 +275,7 @@ struct zcore_header {
        u32 num_pages;
        u32 pad1;
        u64 tod;
-       cpuid_t cpu_id;
+       struct cpuid cpu_id;
        u32 arch_id;
        u32 volnr;
        u32 build_arch;