X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-sh%2Ftypes.h;h=a6e1d4126e6756fdc0dbf78f345637bc42eb3b72;hb=1ba6ab11d8fbd8d29afec4e39236e1255ae0339a;hp=3c09dd4ca31cabb7d59e3d56415a2638839eeb1a;hpb=bbe5d235ee201705530a7153b57e141cd77d818b;p=linux-2.6 diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h index 3c09dd4ca3..a6e1d4126e 100644 --- a/include/asm-sh/types.h +++ b/include/asm-sh/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__ */ @@ -52,14 +52,10 @@ typedef unsigned long long u64; typedef u32 dma_addr_t; -#ifdef CONFIG_LBD -typedef u64 sector_t; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t; -#define HAVE_BLKCNT_T +#ifdef CONFIG_SUPERH32 +typedef u16 opcode_t; +#else +typedef u32 opcode_t; #endif #endif /* __ASSEMBLY__ */