Merge branch 'fixes' into for-linus

[~andy/linux] / sound / pci / hda / hda_trace.h

diff --git a/sound/pci/hda/hda_trace.h b/sound/pci/hda/hda_trace.h
index 9a34b867d8c272531692679f829fa9f57bd44e6f..3a1c63161eb129d71a02203ce9fe3a3b24ec6df4 100644 (file)
--- a/sound/pci/hda/hda_trace.h
+++ b/sound/pci/hda/hda_trace.h
@@ -58,6 +58,7 @@ TRACE_EVENT(hda_bus_reset,
        TP_printk("[%d]", __entry->card)
 );
 
+#ifdef CONFIG_PM
 DECLARE_EVENT_CLASS(hda_power,
 
        TP_PROTO(struct hda_codec *codec),
@@ -110,6 +111,7 @@ TRACE_EVENT(hda_power_count,
                  __entry->card, __entry->addr, __entry->power_count,
                  __entry->power_on, __entry->power_transition)
 );
+#endif /* CONFIG_PM */
 
 TRACE_EVENT(hda_unsol_event,