I just applied these three patches to the tip:x86/setup-lzma tree to
resolve the build issues in some configurations.  The third and largest
patch is a slightly modified version of Alain's last patch, the other
two addresses the Kconfig chain.  Please review.

	-hpa