--- zzzz-none-000/linux-4.4.60/include/uapi/linux/Kbuild	2017-04-08 07:53:53.000000000 +0000
+++ scorpion-7490-727/linux-4.4.60/include/uapi/linux/Kbuild	2021-02-04 17:41:59.000000000 +0000
@@ -161,6 +161,7 @@
 header-y += if_arcnet.h
 header-y += if_arp.h
 header-y += if_bonding.h
+header-y += if_bonding_genl.h
 header-y += if_bridge.h
 header-y += if_cablemodem.h
 header-y += if_eql.h
@@ -195,6 +196,8 @@
 header-y += input-event-codes.h
 header-y += in_route.h
 header-y += ioctl.h
+header-y += ion.h
+header-y += ion_test.h
 header-y += ip6_tunnel.h
 header-y += ipc.h
 header-y += ip.h
@@ -271,6 +274,8 @@
 header-y += mroute.h
 header-y += msdos_fs.h
 header-y += msg.h
+header-y += msm_thermal_ioctl.h
+header-y += msm_ion.h
 header-y += mtio.h
 header-y += nbd.h
 header-y += ncp_fs.h
@@ -388,6 +393,7 @@
 header-y += string.h
 header-y += suspend_ioctls.h
 header-y += swab.h
+header-y += switch.h
 header-y += synclink.h
 header-y += sysctl.h
 header-y += sysinfo.h
@@ -461,3 +467,51 @@
 header-y += zorro.h
 header-y += zorro_ids.h
 header-y += userfaultfd.h
+header-y += msm_rmnet.h
+header-y += rmnet_data.h
+
+#
+# AVM
+# Export avm specific headers if there are present
+#  these headers will be header-y
+
+avm_labile_headers += avm_kernel_config.h
+# avm_labile_headers contains header files that might not exist
+avm_labile_headers += rprot_nettty.h
+avm_labile_headers += ulpcmlink.h
+avm_labile_headers += avm_dect_api.h
+avm_labile_headers += dio_fpapi.h
+avm_labile_headers += primitiv.h
+
+# these headers will be header-y, when we are finished 
+# porting avm stack to VRX
+avm_labile_headers += avm_led_event.h
+avm_labile_headers += avm_net_trace_ioctl.h
+avm_labile_headers += avm_pa.h
+avm_labile_headers += avm_pa_hw.h
+avm_labile_headers += avm_pa_ifx_multiplexer.h
+avm_labile_headers += avm_pa_intern.h
+avm_labile_headers += avm_proc.h
+avm_labile_headers += capi_codec.h
+avm_labile_headers += capidef.h
+avm_labile_headers += codec_dsp.h
+avm_labile_headers += import_rtp.h
+avm_labile_headers += pcmlink_audio.h
+avm_labile_headers += pcmroute.h
+avm_labile_headers += rtp_fastpath.h
+
+avm_labile_headers += avm_event.h
+avm_labile_headers += tffs.h
+avm_labile_headers += avm_hw_config.h
+avm_labile_headers += avm_hw_config_def.h
+avm_labile_headers += leds-ipq.h
+
+
+# Check existence of avm_labile_headers ('wildcard' functions requires complete
+# path, 'header-y' forbids absolute path names).
+header-y += $(patsubst $(srctree)/include/uapi/linux/%,%,\
+  $(wildcard \
+   $(addprefix $(srctree)/include/uapi/linux/,\
+    $(avm_labile_headers))))
+
+-include $(srctree)/avm/make/generated/uapi-compat-headers.make