Merge branch 'master' into radar

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

diff --git a/carlfw/include/fwdsc.h b/carlfw/include/fwdsc.h
index 6ae6563c6bd099851ab48971c51eeb6a63bb1ec8..ce9ae8fc9fe11472b9b97b4d5e27f12e32334b08 100644 (file)
--- a/carlfw/include/fwdsc.h
+++ b/carlfw/include/fwdsc.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __CARL9170FW_FWDSC_H
@@ -35,9 +34,9 @@ struct carl9170_firmware_descriptor {
        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 */
+#if defined(CONFIG_CARL9170FW_PATTERN_GENERATOR)
+       struct carl9170fw_pattern_desc pattern;
+#endif /* CONFIG_CARL9170FW_PATTERN_GENERATOR */
        struct carl9170fw_dbg_desc  dbg;
        struct carl9170fw_last_desc last;
 } __packed;