diff options
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/floppy.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/ipc.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/semaphore.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/types.h | 6 |
4 files changed, 3 insertions, 7 deletions
diff --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h index d595c15..41a5e9d 100644 --- a/include/asm-arm/floppy.h +++ b/include/asm-arm/floppy.h @@ -128,8 +128,6 @@ static inline void fd_scandrives (void) #define N_FDC 1 #define N_DRIVE 4 -#define FLOPPY_MOTOR_MASK 0xf0 - #define CROSS_64KB(a,s) (0) /* diff --git a/include/asm-arm/ipc.h b/include/asm-arm/ipc.h deleted file mode 100644 index a46e3d9..0000000 --- a/include/asm-arm/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/ipc.h> diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index d5dc624..1c8b441 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h @@ -28,7 +28,6 @@ struct semaphore { struct semaphore name = __SEMAPHORE_INIT(name,count) #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) -#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) static inline void sema_init(struct semaphore *sem, int val) { diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h index 22992ee..3141451 100644 --- a/include/asm-arm/types.h +++ b/include/asm-arm/types.h @@ -19,9 +19,9 @@ typedef unsigned short __u16; typedef __signed__ int __s32; typedef unsigned int __u32; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; +#if defined(__GNUC__) +__extension__ typedef __signed__ long long __s64; +__extension__ typedef unsigned long long __u64; #endif #endif /* __ASSEMBLY__ */ |