Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'

[deliverable/linux.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 70dd3dfde6319e661069f6b8c2d5a6b15804f27f..baf718324f4ab5bbd10d0a9ffa7069fdba8b2f18 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -156,7 +156,6 @@ typedef u32 dma_addr_t;
 
 typedef unsigned __bitwise__ gfp_t;
 typedef unsigned __bitwise__ fmode_t;
-typedef unsigned __bitwise__ oom_flags_t;
 
 #ifdef CONFIG_PHYS_ADDR_T_64BIT
 typedef u64 phys_addr_t;