diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-22 09:23:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-22 09:23:13 +0200 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /arch/arm/mach-cns3xxx/include/mach/entry-macro.S | |
| parent | bna: PCI Probe Conf Lock Fix (diff) | |
| parent | Linux 3.1-rc7 (diff) | |
| download | linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.xz linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.zip | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S index 6bd83ed90afe..d87bfc397d39 100644 --- a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S +++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S @@ -8,7 +8,6 @@ * published by the Free Software Foundation. */ -#include <mach/hardware.h> #include <asm/hardware/entry-macro-gic.S> .macro disable_fiq |