Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / tboot.h

diff --git a/include/linux/tboot.h b/include/linux/tboot.h
index bf2a0c7488780b6096d2c5ccf93716fdea5b5b89..1dba6ee55203fec99992d211eb169938fcec918e 100644 (file)
--- a/include/linux/tboot.h
+++ b/include/linux/tboot.h
@@ -150,6 +150,7 @@ extern int tboot_force_iommu(void);
 
 #else
 
+#define tboot_enabled()                        0
 #define tboot_probe()                  do { } while (0)
 #define tboot_shutdown(shutdown_type)  do { } while (0)
 #define tboot_sleep(sleep_state, pm1a_control, pm1b_control)   \