=== modified file 'ChangeLog'
--- ChangeLog	2012-10-28 10:55:22 +0000
+++ ChangeLog	2012-11-28 12:42:39 +0000
@@ -1,3 +1,8 @@
+2012-11-28  Leif Lindholm  <leif.lindholm@arm.com>
+
+        * include/grub/types.h: Fix functionality unaffecting typo in 
+        GRUB_TARGET_WORDSIZE conditional macro.
+
 2012-10-28  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/grub.d/10_netbsd.in: Fix tab indentation and make sure

=== modified file 'include/grub/types.h'
--- include/grub/types.h	2012-06-07 12:07:02 +0000
+++ include/grub/types.h	2012-11-26 17:40:33 +0000
@@ -50,7 +50,7 @@
 # error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
 #endif
 
-#if !defined (GRUB_UTIL) & !defined (GRUB_TARGET_WORDSIZE)
+#if !defined (GRUB_UTIL) && !defined (GRUB_TARGET_WORDSIZE)
 # if GRUB_TARGET_SIZEOF_VOID_P == 4
 #  define GRUB_TARGET_WORDSIZE 32
 # elif GRUB_TARGET_SIZEOF_VOID_P == 8