diff --git a/[refs] b/[refs] index f6581546862e..d41a364e4a10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3d46f9d3194e0329216002a8724d4c0957abc79 +refs/heads/master: 81880d603d00c645e0890d0a44d50711c503b72b diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h index c42724f8c802..23d237a075e2 100644 --- a/trunk/include/linux/types.h +++ b/trunk/include/linux/types.h @@ -188,12 +188,12 @@ typedef u32 phys_addr_t; typedef phys_addr_t resource_size_t; typedef struct { - volatile int counter; + int counter; } atomic_t; #ifdef CONFIG_64BIT typedef struct { - volatile long counter; + long counter; } atomic64_t; #endif