diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-11 00:32:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-11 00:32:51 +0100 |
| commit | d4185bbf62a5d8d777ee445db1581beb17882a07 (patch) | |
| tree | 024b0badbd7c970b1983be6d8c345cc4a290cb31 /arch/xtensa/include/asm/div64.h | |
| parent | ip6tnl: advertise tunnel param via rtnl (diff) | |
| parent | gre6: fix rtnl dump messages (diff) | |
| download | linux-d4185bbf62a5d8d777ee445db1581beb17882a07.tar.xz linux-d4185bbf62a5d8d777ee445db1581beb17882a07.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/xtensa/include/asm/div64.h')
| -rw-r--r-- | arch/xtensa/include/asm/div64.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/xtensa/include/asm/div64.h b/arch/xtensa/include/asm/div64.h deleted file mode 100644 index f35678cb0a9b..000000000000 --- a/arch/xtensa/include/asm/div64.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * include/asm-xtensa/div64.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) 2001 - 2007 Tensilica Inc. - */ - -#ifndef _XTENSA_DIV64_H -#define _XTENSA_DIV64_H - -#include <asm-generic/div64.h> - -#endif /* _XTENSA_DIV64_H */ |