Merge branch 'master' into radar

[carl9170fw.git] / carlfw / include / fwdsc.h

diff --git a/carlfw/include/fwdsc.h b/carlfw/include/fwdsc.h
index b521c7d79d1c5d8d783de98d968b75a60615b2b9..6ae6563c6bd099851ab48971c51eeb6a63bb1ec8 100644 (file)
--- a/carlfw/include/fwdsc.h
+++ b/carlfw/include/fwdsc.h
@@ -31,7 +31,13 @@
 struct carl9170_firmware_descriptor {
        struct carl9170fw_otus_desc otus;
        struct carl9170fw_txsq_desc txsq;
+#ifdef CONFIG_CARL9170FW_WOL
+       struct carl9170fw_wol_desc  wol;
+#endif /* CONFIG_CARL9170FW_WOL */
        struct carl9170fw_motd_desc motd;
+#ifdef CONFIG_CARL9170FW_RADAR
+       struct carl9170fw_radar_desc radar;
+#endif /* CONFIG_CARL9170FW_RADAR */
        struct carl9170fw_dbg_desc  dbg;
        struct carl9170fw_last_desc last;
 } __packed;