diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-xtensa/sembuf.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-xtensa/sembuf.h')
| -rw-r--r-- | include/asm-xtensa/sembuf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/sembuf.h b/include/asm-xtensa/sembuf.h index 2d26c47666fe..c15870493b33 100644 --- a/include/asm-xtensa/sembuf.h +++ b/include/asm-xtensa/sembuf.h | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | struct semid64_ds { | 26 | struct semid64_ds { |
| 27 | struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ | 27 | struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ |
| 28 | #if XCHAL_HAVE_LE | 28 | #ifdef __XTENSA_EL__ |
| 29 | __kernel_time_t sem_otime; /* last semop time */ | 29 | __kernel_time_t sem_otime; /* last semop time */ |
| 30 | unsigned long __unused1; | 30 | unsigned long __unused1; |
| 31 | __kernel_time_t sem_ctime; /* last change time */ | 31 | __kernel_time_t sem_ctime; /* last change time */ |