iio: Fix merge flub that caused build issues

There was an apparent merge flub that caused build failures.
This patch removes the duplicated structure element.

Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Merge branch 'tracking-core-configs' into merge-linux-linaro-core-tracking
Merge branch 'tracking-basic-board-configs' into merge-linux-linaro-core-tracking
Merge branch 'tracking-linaro-android-3.15' into merge-linux-linaro-core-tracking
Merge branch 'tracking-gator' into merge-linux-linaro-core-tracking
Merge branch 'tracking-multi-pmu' into merge-linux-linaro-core-tracking
Merge branch 'tracking-cortex-strings-arm64' into merge-linux-linaro-core-tracking
Merge branch 'tracking-samsung-boards-core-support' into merge-linux-linaro-core-tracking
Merge branch 'tracking-capri-support' into merge-linux-linaro-core-tracking
Merge branch 'tracking-linaro-builddeb-tweaks' into merge-linux-linaro-core-tracking
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-tracking
Merge branch 'tracking-armlt-config' into integration-linaro-vexpress
Merge branch 'tracking-armlt-rtsm' into integration-linaro-vexpress
Merge branch 'tracking-armlt-ve-updates' into integration-linaro-vexpress
Merge branch 'tracking-armlt-hdlcd' into integration-linaro-vexpress

Conflicts:
	arch/arm/mach-vexpress/v2m.c
Merge branch 'tracking-armlt-clcd' into integration-linaro-vexpress
Merge branch 'tracking-armlt-misc-fixes' into integration-linaro-vexpress
Merge branch 'tracking-armlt-tc2-dt' into integration-linaro-vexpress
Merge branch 'tracking-armlt-psci' into integration-linaro-vexpress
Merge branch 'tracking-armlt-mcpm' into integration-linaro-vexpress