diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2003-10-07 07:12:47 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2003-10-07 07:12:47 +0000 |
| commit | 0862b7812f4057b5c734c9261e67428bb4f67c4e (patch) | |
| tree | 8d5db390a773752e0c55e2c823cfc3730751aa10 /config/Config.in | |
| parent | 4783dd42674e59ad695802360d1e5333b37f9c0f (diff) | |
| download | ptxdist-0862b7812f4057b5c734c9261e67428bb4f67c4e.tar.gz ptxdist-0862b7812f4057b5c734c9261e67428bb4f67c4e.tar.xz | |
Fixed cvs waste. [RSC]
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@512 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'config/Config.in')
| -rw-r--r-- | config/Config.in | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/config/Config.in b/config/Config.in index cc3fa0309..8a14a81f7 100644 --- a/config/Config.in +++ b/config/Config.in @@ -89,20 +89,13 @@ choice config MIPS_ARCH_LE bool "mipsel (little endian)" endchoice -======= + config ARCH string default "arm" if ARCH_ARM default "i386" if ARCH_X86 ->>>>>>> 1.1.1.1 -======= -choice -======= -choice ->>>>>>> 1.40.2.6 -======= + choice ->>>>>>> 1.41 prompt "ARM architecture" depends on ARCH_ARM || ARCH_ARM_NOMMU @@ -133,7 +126,6 @@ choice config MIPS_ARCH_LE bool "mipsel (little endian)" endchoice ->>>>>>> 1.41 choice prompt "Code Optimization" |