Pull documentation update from Jonathan Corbet:
 "These are the documentation changes for 4.10.

  It's another busy cycle for the docs tree, as the sphinx conversion
  continues. Highlights include:

   - Further work on PDF output, which remains a bit of a pain but
     should be more solid now.

   - Five more DocBook template files converted to Sphinx. Only 27 to
     go... Lots of plain-text files have also been converted and
     integrated.

   - Images in binary formats have been replaced with more
     source-friendly versions.

   - Various bits of organizational work, including the renaming of
     various files discussed at the kernel summit.

   - New documentation for the device_link mechanism.

  ... and, of course, lots of typo fixes and small updates"

* tag 'docs-4.10' of git://git.lwn.net/linux: (193 commits)
  dma-buf: Extract dma-buf.rst
  Update Documentation/00-INDEX
  docs: 00-INDEX: document directories/files with no docs
  docs: 00-INDEX: remove non-existing entries
  docs: 00-INDEX: add missing entries for documentation files/dirs
  docs: 00-INDEX: consolidate process/ and admin-guide/ description
  scripts: add a script to check if Documentation/00-INDEX is sane
  Docs: change sh -> awk in REPORTING-BUGS
  Documentation/core-api/device_link: Add initial documentation
  core-api: remove an unexpected unident
  ppc/idle: Add documentation for powersave=off
  Doc: Correct typo, "Introdution" => "Introduction"
  Documentation/atomic_ops.txt: convert to ReST markup
  Documentation/local_ops.txt: convert to ReST markup
  Documentation/assoc_array.txt: convert to ReST markup
  docs-rst: parse-headers.pl: cleanup the documentation
  docs-rst: fix media cleandocs target
  docs-rst: media/Makefile: reorganize the rules
  docs-rst: media: build SVG from graphviz files
  docs-rst: replace bayer.png by a SVG image
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/dissector_80211.h b/dissector_80211.h
index 53059e5..31e1965 100644
--- a/dissector_80211.h
+++ b/dissector_80211.h
@@ -18,7 +18,7 @@ extern struct hash_table ieee80211_lay2;
 extern void dissector_init_ieee80211(int fnttype);
 extern void dissector_cleanup_ieee80211(void);
 
-#ifdef __WITH_PROTOS
+#ifdef HAVE_DISSECTOR_PROTOS
 static inline struct protocol *dissector_get_ieee80211_entry_point(void)
 {
 	return &ieee80211_ops;
@@ -38,5 +38,5 @@ static inline struct protocol *dissector_get_ieee80211_exit_point(void)
 {
 	return NULL;
 }
-#endif /* __WITH_PROTOS */
+#endif
 #endif /* DISSECTOR_80211_H */