Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74d505b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes 

* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
  fix asm-mips/types.h syntax error
  fix asm-alpha/types.h breakage
parents 45ea2103 2961b423

include/asm-alpha/types.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -23,5 +23,11 @@ typedef unsigned int umode_t; 




#define BITS_PER_LONG 64

#define BITS_PER_LONG 64





#ifndef __ASSEMBLY__



typedef u64 dma_addr_t;

typedef u64 dma64_addr_t;



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif /* _ALPHA_TYPES_H */
 
#endif /* _ALPHA_TYPES_H */

include/asm-mips/types.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ 




typedef unsigned short umode_t;

typedef unsigned short umode_t;





#endif



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */





/*

/*