update autoconf.h

Conflicts:

	include/linux/autoconf.h