diff --git a/[refs] b/[refs] index 0dedc452218f..5be6b6c08c6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 +refs/heads/master: 568cb09b9d889b6f2852ede19772b8e9eed36c1e diff --git a/trunk/include/asm-arm/unistd.h b/trunk/include/asm-arm/unistd.h index 26f2f4828e03..cbf39a56dbe7 100644 --- a/trunk/include/asm-arm/unistd.h +++ b/trunk/include/asm-arm/unistd.h @@ -363,7 +363,7 @@ /* * The following syscalls are obsolete and no longer available for EABI. */ -#if defined(__ARM_EABI__) +#if defined(__ARM_EABI__) && !defined(__KERNEL__) #undef __NR_time #undef __NR_umount #undef __NR_stime