Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

[~andy/linux] / include / asm-s390 / sclp.h

diff --git a/include/asm-s390/sclp.h b/include/asm-s390/sclp.h
index ddfaa8db47be3f17058d122ecdb77e1ebb62a113..cb9faf1ea5cfd5db60a602e45af058bceddc06f2 100644 (file)
--- a/include/asm-s390/sclp.h
+++ b/include/asm-s390/sclp.h
@@ -28,6 +28,7 @@ struct sclp_ipl_info {
 };
 
 void sclp_readinfo_early(void);
+void sclp_facilities_detect(void);
 unsigned long long sclp_memory_detect(void);
 int sclp_sdias_blk_count(void);
 int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);