1 files changed, 16 insertions, 17 deletions
diff --git a/Documentation/media/conf_nitpick.py b/Documentation/media/conf_nitpick.py
index 11beac2e68fb..227deee68c88 100644
--- a/Documentation/media/conf_nitpick.py
+++ b/Documentation/media/conf_nitpick.py
@@ -39,55 +39,54 @@ nitpick_ignore = [
     ("c:func", "write"),
     ("c:type", "atomic_t"),
     ("c:type", "bool"),
+    ("c:type", "boolean"),
     ("c:type", "buf_queue"),
     ("c:type", "device"),
     ("c:type", "device_driver"),
     ("c:type", "device_node"),
     ("c:type", "enum"),
+    ("c:type", "fd"),
+    ("c:type", "fd_set"),
     ("c:type", "file"),
     ("c:type", "i2c_adapter"),
     ("c:type", "i2c_board_info"),
     ("c:type", "i2c_client"),
+    ("c:type", "int16_t"),
     ("c:type", "ktime_t"),
     ("c:type", "led_classdev_flash"),
     ("c:type", "list_head"),
     ("c:type", "lock_class_key"),
     ("c:type", "module"),
     ("c:type", "mutex"),
+    ("c:type", "NULL"),
+    ("c:type", "off_t"),
     ("c:type", "pci_dev"),
     ("c:type", "pdvbdev"),
+    ("c:type", "pollfd"),
     ("c:type", "poll_table_struct"),
     ("c:type", "s32"),
     ("c:type", "s64"),
     ("c:type", "sd"),
+    ("c:type", "size_t"),
     ("c:type", "spi_board_info"),
     ("c:type", "spi_device"),
     ("c:type", "spi_master"),
+    ("c:type", "ssize_t"),
     ("c:type", "struct fb_fix_screeninfo"),
     ("c:type", "struct pollfd"),
     ("c:type", "struct timeval"),
     ("c:type", "struct video_capability"),
+    ("c:type", "timeval"),
+    ("c:type", "__u16"),
     ("c:type", "u16"),
+    ("c:type", "__u32"),
     ("c:type", "u32"),
+    ("c:type", "__u64"),
     ("c:type", "u64"),
     ("c:type", "u8"),
+    ("c:type", "uint16_t"),
+    ("c:type", "uint32_t"),
     ("c:type", "union"),
     ("c:type", "usb_device"),
-
-    ("cpp:type", "boolean"),
-    ("cpp:type", "fd"),
-    ("cpp:type", "fd_set"),
-    ("cpp:type", "int16_t"),
-    ("cpp:type", "NULL"),
-    ("cpp:type", "off_t"),
-    ("cpp:type", "pollfd"),
-    ("cpp:type", "size_t"),
-    ("cpp:type", "ssize_t"),
-    ("cpp:type", "timeval"),
-    ("cpp:type", "__u16"),
-    ("cpp:type", "__u32"),
-    ("cpp:type", "__u64"),
-    ("cpp:type", "uint16_t"),
-    ("cpp:type", "uint32_t"),
-    ("cpp:type", "video_system_t"),
+    ("c:type", "video_system_t"),
 ]