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

Commit f6c72781 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/header-fixes' of... 

Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip into core/header-fixes
parents 0b86a4e3 527bdfee

arch/ia64/include/asm/fpu.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -6,8 +6,6 @@ 
 *	David Mosberger-Tang <davidm@hpl.hp.com>

 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */

 */





#include <linux/types.h>



/* floating point status register: */

/* floating point status register: */

#define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */

#define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */

#define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */

#define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */

include/linux/types.h

+2 −1
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_TYPES_H

#ifndef _LINUX_TYPES_H

#define _LINUX_TYPES_H

#define _LINUX_TYPES_H





#ifndef __ASSEMBLY__

#ifdef	__KERNEL__

#ifdef	__KERNEL__





#define DECLARE_BITMAP(name,bits) \

#define DECLARE_BITMAP(name,bits) \
@@ -212,5 +213,5 @@ struct ustat { 
};

};





#endif	/* __KERNEL__ */

#endif	/* __KERNEL__ */



#endif /*  __ASSEMBLY__ */

#endif /* _LINUX_TYPES_H */
 
#endif /* _LINUX_TYPES_H */