Commit 1d00e832 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4313/1: S3C24XX: Update s3c2410 defconfig to 2.6.21-rc6
  [ARM] Update mach-types
parents 94a05509 1af1e32a
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-rc1
# Wed Feb 21 16:48:01 2007
# Linux kernel version: 2.6.21-rc6
# Mon Apr 9 10:12:58 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_GENERIC_GPIO=y
# CONFIG_GENERIC_TIME is not set
CONFIG_MMU=y
CONFIG_NO_IOPORT=y
......@@ -45,6 +46,7 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
......@@ -531,7 +533,6 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
CONFIG_ATA_OVER_ETH=m
......@@ -560,7 +561,6 @@ CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDE_BAST=y
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_BLK_DEV_IDEDMA is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_BLK_DEV_HD is not set
#
......@@ -941,6 +941,7 @@ CONFIG_LEDS_CLASS=m
# LED drivers
#
CONFIG_LEDS_S3C24XX=m
CONFIG_LEDS_H1940=m
#
# LED Triggers
......@@ -1125,6 +1126,7 @@ CONFIG_USB_MON=y
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
#
......@@ -1169,7 +1171,6 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
CONFIG_RTC_DRV_S3C=y
......
......@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
# Last update: Tue Jan 16 16:52:56 2007
# Last update: Mon Apr 16 21:01:04 2007
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
......@@ -1190,13 +1190,12 @@ g500 MACH_G500 G500 1178
bug MACH_BUG BUG 1179
mx33ads MACH_MX33ADS MX33ADS 1180
chub MACH_CHUB CHUB 1181
gta01 MACH_GTA01 GTA01 1182
neo1973_gta01 MACH_NEO1973_GTA01 NEO1973_GTA01 1182
w90n740 MACH_W90N740 W90N740 1183
medallion_sa2410 MACH_MEDALLION_SA2410 MEDALLION_SA2410 1184
ia_cpu_9200_2 MACH_IA_CPU_9200_2 IA_CPU_9200_2 1185
dimmrm9200 MACH_DIMMRM9200 DIMMRM9200 1186
pm9261 MACH_PM9261 PM9261 1187
mx21 MACH_MX21 MX21 1188
ml7304 MACH_ML7304 ML7304 1189
ucp250 MACH_UCP250 UCP250 1190
intboard MACH_INTBOARD INTBOARD 1191
......@@ -1242,3 +1241,97 @@ xscale_treo680 MACH_XSCALE_TREO680 XSCALE_TREO680 1230
tecon_tmezon MACH_TECON_TMEZON TECON_TMEZON 1231
zylonite MACH_ZYLONITE ZYLONITE 1233
gene1270 MACH_GENE1270 GENE1270 1234
zir2412 MACH_ZIR2412 ZIR2412 1235
mx31lite MACH_MX31LITE MX31LITE 1236
t700wx MACH_T700WX T700WX 1237
vf100 MACH_VF100 VF100 1238
nsb2 MACH_NSB2 NSB2 1239
nxhmi_bb MACH_NXHMI_BB NXHMI_BB 1240
nxhmi_re MACH_NXHMI_RE NXHMI_RE 1241
n4100pro MACH_N4100PRO N4100PRO 1242
sam9260 MACH_SAM9260 SAM9260 1243
omap_treo600 MACH_OMAP_TREO600 OMAP_TREO600 1244
indy2410 MACH_INDY2410 INDY2410 1245
nelt_a MACH_NELT_A NELT_A 1246
n311 MACH_N311 N311 1248
at91sam9260vgk MACH_AT91SAM9260VGK AT91SAM9260VGK 1249
at91leppe MACH_AT91LEPPE AT91LEPPE 1250
at91lepccn MACH_AT91LEPCCN AT91LEPCCN 1251
apc7100 MACH_APC7100 APC7100 1252
stargazer MACH_STARGAZER STARGAZER 1253
sonata MACH_SONATA SONATA 1254
schmoogie MACH_SCHMOOGIE SCHMOOGIE 1255
aztool MACH_AZTOOL AZTOOL 1256
mioa701 MACH_MIOA701 MIOA701 1257
sxni9260 MACH_SXNI9260 SXNI9260 1258
mxc27520evb MACH_MXC27520EVB MXC27520EVB 1259
armadillo5x0 MACH_ARMADILLO5X0 ARMADILLO5X0 1260
mb9260 MACH_MB9260 MB9260 1261
mb9263 MACH_MB9263 MB9263 1262
ipac9302 MACH_IPAC9302 IPAC9302 1263
cc9p9360js MACH_CC9P9360JS CC9P9360JS 1264
gallium MACH_GALLIUM GALLIUM 1265
msc2410 MACH_MSC2410 MSC2410 1266
ghi270 MACH_GHI270 GHI270 1267
davinci_leonardo MACH_DAVINCI_LEONARDO DAVINCI_LEONARDO 1268
oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272
compex42x MACH_COMPEXWP18 COMPEXWP18 1273
xmate MACH_XMATE XMATE 1274
energizer MACH_ENERGIZER ENERGIZER 1275
ime1 MACH_IME1 IME1 1276
sweda_tms MACH_SWEDATMS SWEDATMS 1277
ntnp435c MACH_NTNP435C NTNP435C 1278
spectro2 MACH_SPECTRO2 SPECTRO2 1279
h6039 MACH_H6039 H6039 1280
ep80219 MACH_EP80219 EP80219 1281
samoa_ii MACH_SAMOA_II SAMOA_II 1282
cwmxl MACH_CWMXL CWMXL 1283
as9200 MACH_AS9200 AS9200 1284
sfx1149 MACH_SFX1149 SFX1149 1285
navi010 MACH_NAVI010 NAVI010 1286
multmdp MACH_MULTMDP MULTMDP 1287
scb9520 MACH_SCB9520 SCB9520 1288
htcathena MACH_HTCATHENA HTCATHENA 1289
xp179 MACH_XP179 XP179 1290
h4300 MACH_H4300 H4300 1291
goramo_mlr MACH_GORAMO_MLR GORAMO_MLR 1292
mxc30020evb MACH_MXC30020EVB MXC30020EVB 1293
adsbitsymx MACH_ADSBITSIMX ADSBITSIMX 1294
adsportalplus MACH_ADSPORTALPLUS ADSPORTALPLUS 1295
mmsp2plus MACH_MMSP2PLUS MMSP2PLUS 1296
em_x270 MACH_EM_X270 EM_X270 1297
tpp302 MACH_TPP302 TPP302 1298
tpp104 MACH_TPM104 TPM104 1299
tpm102 MACH_TPM102 TPM102 1300
tpm109 MACH_TPM109 TPM109 1301
fbxo1 MACH_FBXO1 FBXO1 1302
hxd8 MACH_HXD8 HXD8 1303
neo1973_gta02 MACH_NEO1973_GTA02 NEO1973_GTA02 1304
emtest MACH_EMTEST EMTEST 1305
ad6900 MACH_AD6900 AD6900 1306
europa MACH_EUROPA EUROPA 1307
metroconnect MACH_METROCONNECT METROCONNECT 1308
ez_s2410 MACH_EZ_S2410 EZ_S2410 1309
ez_s2440 MACH_EZ_S2440 EZ_S2440 1310
ez_ep9312 MACH_EZ_EP9312 EZ_EP9312 1311
ez_ep9315 MACH_EZ_EP9315 EZ_EP9315 1312
ez_x7 MACH_EZ_X7 EZ_X7 1313
godotdb MACH_GODOTDB GODOTDB 1314
mistral MACH_MISTRAL MISTRAL 1315
msm MACH_MSM MSM 1316
ct5910 MACH_CT5910 CT5910 1317
ct5912 MACH_CT5912 CT5912 1318
hynet_ine MACH_HYNET_INE HYNET_INE 1319
hynet_app MACH_HYNET_APP HYNET_APP 1320
msm7200 MACH_MSM7200 MSM7200 1321
msm7600 MACH_MSM7600 MSM7600 1322
ceb255 MACH_CEB255 CEB255 1323
ciel MACH_CIEL CIEL 1324
slm5650 MACH_SLM5650 SLM5650 1325
at91sam9rlek MACH_AT91SAM9RLEK AT91SAM9RLEK 1326
comtech_router MACH_COMTECH_ROUTER COMTECH_ROUTER 1327
sbc2410x MACH_SBC2410X SBC2410X 1328
at4x0bd MACH_AT4X0BD AT4X0BD 1329
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment