Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201679
b: refs/heads/master
c: 8cd1b5c
h: refs/heads/master
i:
  201677: 395ab31
  201675: da86cf9
  201671: 16386f0
  201663: af45f77
v: v3
  • Loading branch information
Eric Bénard authored and Sascha Hauer committed Jul 26, 2010
1 parent 30381be commit 9379210
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72fe99f642e09645942ae78539121754b0172ac6
refs/heads/master: 8cd1b5c3d4e686c30404a9a466972e2ee13ada9f
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-mx25/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ config MACH_EUKREA_CPUIMX25
choice
prompt "Baseboard"
depends on MACH_EUKREA_CPUIMX25
default MACH_EUKREA_MBIMXSD_BASEBOARD
default MACH_EUKREA_MBIMXSD25_BASEBOARD

config MACH_EUKREA_MBIMXSD_BASEBOARD
config MACH_EUKREA_MBIMXSD25_BASEBOARD
prompt "Eukrea MBIMXSD development board"
bool
help
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx25/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ obj-y := mm.o devices.o
obj-$(CONFIG_ARCH_MX25) += clock.o
obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-cpuimx25.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD) += eukrea_mbimxsd-baseboard.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd-baseboard.o
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-mx3/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ config MACH_EUKREA_CPUIMX35
choice
prompt "Baseboard"
depends on MACH_EUKREA_CPUIMX35
default MACH_EUKREA_MBIMXSD_BASEBOARD
default MACH_EUKREA_MBIMXSD35_BASEBOARD

config MACH_EUKREA_MBIMXSD_BASEBOARD
config MACH_EUKREA_MBIMXSD35_BASEBOARD
prompt "Eukrea MBIMXSD development board"
bool
help
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += mach-cpuimx35.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD) += eukrea_mbimxsd-baseboard.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd-baseboard.o

0 comments on commit 9379210

Please sign in to comment.