diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-14 10:53:50 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-14 10:53:50 +1100 |
| commit | e79da086628e513718d65e32a388b8b41525e397 (patch) | |
| tree | 577602fb555970aaadcbbf690a83a4b6a724903f /drivers | |
| parent | 59aa367b2512acb19a24423387e0649eb33fb290 (diff) | |
| parent | e9f717fb534c1cfc167cbbc04bcde24699921e3b (diff) | |
Merge remote-tracking branch 'kbuild/for-next'
Conflicts:
arch/arm/mach-at91/Makefile
scripts/tags.sh
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/shmobile/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/wimax/Makefile | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile index 531d4f6c7050..960bf22d42ae 100644 --- a/drivers/clk/shmobile/Makefile +++ b/drivers/clk/shmobile/Makefile @@ -7,5 +7,3 @@ obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o -# for emply built-in.o -obj-n := dummy diff --git a/drivers/net/wimax/Makefile b/drivers/net/wimax/Makefile index 992bc02bc016..692184dd674a 100644 --- a/drivers/net/wimax/Makefile +++ b/drivers/net/wimax/Makefile @@ -1,5 +1 @@ - obj-$(CONFIG_WIMAX_I2400M) += i2400m/ - -# (from Sam Ravnborg) force kbuild to create built-in.o -obj- := dummy.o |