Merge branch 'topic/hda-config-pm-cleanup' into for-next

[linux-2.6-block.git] / sound / pci / hda / hda_intel_trace.h

diff --git a/sound/pci/hda/hda_intel_trace.h b/sound/pci/hda/hda_intel_trace.h
index 73a7adfa192d00ed65c033ed338bd7d60ccaf483..2775fa81a5007228965da9f31adb2f30aee77b94 100644 (file)
--- a/sound/pci/hda/hda_intel_trace.h
+++ b/sound/pci/hda/hda_intel_trace.h
@@ -34,7 +34,6 @@ DEFINE_EVENT(hda_pm, azx_resume,
        TP_ARGS(chip)
 );
 
-#ifdef CONFIG_PM
 DEFINE_EVENT(hda_pm, azx_runtime_suspend,
        TP_PROTO(struct azx *chip),
        TP_ARGS(chip)
@@ -44,7 +43,6 @@ DEFINE_EVENT(hda_pm, azx_runtime_resume,
        TP_PROTO(struct azx *chip),
        TP_ARGS(chip)
 );
-#endif
 
 #endif /* _TRACE_HDA_INTEL_H */