am 434f97f6: Merge "Remove some old kernel header cruft not needed with uapi."

* commit '434f97f66aa64cd082f3f62fdd6422cad3132706':
  Remove some old kernel header cruft not needed with uapi.
This commit is contained in:
Elliott Hughes 2013-12-20 18:26:21 -08:00 committed by Android Git Automerger
commit 51166a7e6f

View File

@ -44,9 +44,7 @@
#else
/* For 32-bit, we're stuck with the definitions we already shipped,
* even though they contain a sigset_t that's too small. */
# define __ARCH_SI_UID_T __kernel_uid32_t /* TODO: 64-bit: remove this when we've switch 32-bit to uapi too. */
# include <linux/signal.h>
# undef __ARCH_SI_UID_T
#endif
__BEGIN_DECLS