diff options
author | Al Viro | 2012-11-17 04:27:58 +0100 |
---|---|---|
committer | Al Viro | 2012-11-17 04:27:58 +0100 |
commit | d05f06e60df4f56a70fb8a3e46335b40687169e9 (patch) | |
tree | c1eec6749fed86a21b08606e1e4acefe4b033253 /arch/xtensa/include/asm/resource.h | |
parent | Merge branch 'arch-s390' into no-rebases (diff) | |
parent | frv: fix the broken preempt (diff) | |
download | kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.gz kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.xz kernel-qcow2-linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.zip |
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/xtensa/include/asm/resource.h')
-rw-r--r-- | arch/xtensa/include/asm/resource.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/xtensa/include/asm/resource.h b/arch/xtensa/include/asm/resource.h deleted file mode 100644 index 17b5ab311771..000000000000 --- a/arch/xtensa/include/asm/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * include/asm-xtensa/resource.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2005 Tensilica Inc. - */ - -#ifndef _XTENSA_RESOURCE_H -#define _XTENSA_RESOURCE_H - -#include <asm-generic/resource.h> - -#endif /* _XTENSA_RESOURCE_H */ |