Merge tag 'arc-4.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupt...

[karo-tx-linux.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index baf718324f4ab5bbd10d0a9ffa7069fdba8b2f18..d501ad3ba2478c6ef23e01c3449bb129c5b181aa 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -154,8 +154,8 @@ typedef u64 dma_addr_t;
 typedef u32 dma_addr_t;
 #endif
 
-typedef unsigned __bitwise__ gfp_t;
-typedef unsigned __bitwise__ fmode_t;
+typedef unsigned __bitwise gfp_t;
+typedef unsigned __bitwise fmode_t;
 
 #ifdef CONFIG_PHYS_ADDR_T_64BIT
 typedef u64 phys_addr_t;