diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-09 10:47:05 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-09 11:50:14 +0200 |
| commit | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (patch) | |
| tree | d71aae6d706d1f3b01da5f944e247abe308feea0 /board/esd/dasa_sim/Makefile | |
| parent | 7904b70885f3c589c239f6ac978f299a6744557f (diff) | |
| parent | 173d294b94cfec10063a5be40934d6d8fb7981ce (diff) | |
Merge branch 'u-boot/master'
Conflicts:
drivers/net/Makefile
(trivial merge)
Diffstat (limited to 'board/esd/dasa_sim/Makefile')
| -rw-r--r-- | board/esd/dasa_sim/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/board/esd/dasa_sim/Makefile b/board/esd/dasa_sim/Makefile deleted file mode 100644 index eb9f5f86d0..0000000000 --- a/board/esd/dasa_sim/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = dasa_sim.o flash.o cmd_dasa_sim.o eeprom.o ../common/pci.o |