This patch fixes the following compile error caused by
commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
(mips: types: use <asm-generic/int-*.h> for the mips architecture):
<-- snip -->
...
CC kernel/bounds.s
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
include2/asm/types.h:56:2: error: #endif without #if
make[2]: *** [kernel/bounds.s] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
5de735b6b9037ad6b8a30ef51f4bd8e011954144 diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index 7a2ee4f..bcbb8d6 100644
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -19,8 +19,6 @@
typedef unsigned short umode_t;
-#endif
-
#endif /* __ASSEMBLY__ */
/*
--
| Dmitry Torokhov | 2.6.27-rc8+ - first impressions |
| Linus Torvalds | Linux 2.6.27-rc8 |
| Nick Piggin | [patch 3/6] mm: fix fault vs invalidate race for linear mappings |
| Alan Cox | [PATCH 00/76] Queued TTY Patches |
git: | |
| Petr Baudis | [FYI][PATCH] Customizing the WinGit installer |
| Pierre Habouzit | Re: git push (mis ?)behavior |
| Mark Levedahl | Allowing override of the default "origin" nickname |
| Junio C Hamano | [PATCH] Detached HEAD (experimental) |
| Richard Stallman | Real men don't attack straw men |
| Luca Dell'Oca | Authenticate squid in Active Directory |
| Leon Dippenaar | New tcp stack attack |
| Nuno Magalhães | Can't scp, ssh is slow to authenticate. |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| KOSAKI Motohiro | [bug?] tg3: Failed to load firmware "tigon/tg3_tso.bin" |
| Andi Kleen | Re: [PATCH] Disable TSO for non standard qdiscs |
| Alexey Dobriyan | [PATCH 01/33] nf_conntrack_sip: de-static helper pointers |
