diff --git a/[refs] b/[refs] index f05409d7ece6..24232b0d27af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4df7671716f1fffb3437a7c1a14e3d2465fefef +refs/heads/master: f9526785d8a03fd0e21f9cfc951adc03bde1c395 diff --git a/trunk/include/asm-powerpc/shmbuf.h b/trunk/include/asm-powerpc/shmbuf.h index dca582a4f68d..8efa39698b6c 100644 --- a/trunk/include/asm-powerpc/shmbuf.h +++ b/trunk/include/asm-powerpc/shmbuf.h @@ -21,19 +21,19 @@ struct shmid64_ds { struct ipc64_perm shm_perm; /* operation perms */ -#ifndef __power64__ +#ifndef __powerpc64__ unsigned long __unused1; #endif __kernel_time_t shm_atime; /* last attach time */ -#ifndef __power64__ +#ifndef __powerpc64__ unsigned long __unused2; #endif __kernel_time_t shm_dtime; /* last detach time */ -#ifndef __power64__ +#ifndef __powerpc64__ unsigned long __unused3; #endif __kernel_time_t shm_ctime; /* last change time */ -#ifndef __power64__ +#ifndef __powerpc64__ unsigned long __unused4; #endif size_t shm_segsz; /* size of segment (bytes) */