[PULL] button mapping fix and unconstify patches

[Alan Coopersmith]

On 02/ 4/14 01:33 PM, Peter Hutterer wrote:
>        include: make the various button array lengths more obious

obvious?

-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc