diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-03 21:16:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-03 21:16:48 -0500 |
| commit | 71a83a6db6138b9d41d8a0b6b91cb59f6dc4742c (patch) | |
| tree | f74b6e4e48257ec6ce40b95645ecb8533b9cc1f8 /arch/arm/mach-omap2/Makefile | |
| parent | b97526f3ff95f92b107f0fb52cbb8627e395429b (diff) | |
| parent | a6c5170d1edea97c538c81e377e56c7b5c5b7e63 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/rocker/rocker.c
The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 00d5d8f9f150..b83f18fcec9b 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -190,7 +190,7 @@ obj-$(CONFIG_SOC_OMAP2430) += clock2430.o | |||
| 190 | obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o | 190 | obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o |
| 191 | obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o | 191 | obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o |
| 192 | obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o | 192 | obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o |
| 193 | obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o cclock3xxx_data.o | 193 | obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o |
| 194 | obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o | 194 | obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o |
| 195 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) | 195 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) |
| 196 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o | 196 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o |