diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-09 01:59:05 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-09 01:59:05 +0200 |
commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/blackfin/include/asm/errno.h | |
parent | netns bridge: cleanup bridges during netns stop (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinn... (diff) | |
download | linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.tar.xz linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/blackfin/include/asm/errno.h')
-rw-r--r-- | arch/blackfin/include/asm/errno.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/errno.h b/arch/blackfin/include/asm/errno.h new file mode 100644 index 000000000000..164e4f39bb57 --- /dev/null +++ b/arch/blackfin/include/asm/errno.h @@ -0,0 +1,6 @@ +#ifndef _BFIN_ERRNO_H +#define _BFIN_ERRNO_H + +#include<asm-generic/errno.h> + +#endif /* _BFIN_ERRNO_H */ |