b=14390

i=shadow
i=scjody

changes missing from commit of bz-14390-att-14121
needed to get v1_4_12_RC1 to build on Cray XT3

lnet/libcfs/user-prim.c

@@ -276,13 +276,6 @@ void cfs_mem_cache_free(cfs_mem_cache_t *c, void *addr)
         cfs_free(addr);
 }
 
-/*
- * This uses user-visible declarations from <linux/kdev_t.h>
- */
-#ifdef __linux__
-#include <linux/kdev_t.h>
-#endif
-
 void cfs_enter_debugger(void)
 {
         /*