Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258996
b: refs/heads/master
c: 5190f0c
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Jul 26, 2011
1 parent f5ab6b1 commit e0a6d99
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f35119d6681300ba6d76da53cb1ebc2eed62e77a
refs/heads/master: 5190f0c030f46b3169205f34f6d9ef480fa39ef2
2 changes: 0 additions & 2 deletions trunk/include/asm-generic/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#ifndef __ASM_GENERIC_SYSTEM_H
#define __ASM_GENERIC_SYSTEM_H

#ifdef __KERNEL__
#ifndef __ASSEMBLY__

#include <linux/types.h>
Expand Down Expand Up @@ -139,5 +138,4 @@ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)

#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */
#endif /* __ASM_GENERIC_SYSTEM_H */

0 comments on commit e0a6d99

Please sign in to comment.