Merge branch 'fix/soundcore' into for-linus

[pandora-kernel.git] / arch / blackfin / include / asm / sembuf.h

diff --git a/arch/blackfin/include/asm/sembuf.h b/arch/blackfin/include/asm/sembuf.h
index 18deb5c..7673b83 100644 (file)
--- a/arch/blackfin/include/asm/sembuf.h
+++ b/arch/blackfin/include/asm/sembuf.h
@@ -1,25 +1 @@
-#ifndef _BFIN_SEMBUF_H
-#define _BFIN_SEMBUF_H
-
-/*
- * The semid64_ds structure for bfin architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-       struct ipc64_perm sem_perm;     /* permissions .. see ipc.h */
-       __kernel_time_t sem_otime;      /* last semop time */
-       unsigned long __unused1;
-       __kernel_time_t sem_ctime;      /* last change time */
-       unsigned long __unused2;
-       unsigned long sem_nsems;        /* no. of semaphores in array */
-       unsigned long __unused3;
-       unsigned long __unused4;
-};
-
-#endif                         /* _BFIN_SEMBUF_H */
+#include <asm-generic/sembuf.h>