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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 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

Linus Torvalds 19 years ago 1d00e832 94a05509

+102 -8

2 changed files

expand all

arch

arm

configs

s3c2410_defconfig

tools

mach-types

+6 -5

arch/arm/configs/s3c2410_defconfig

··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.21-rc1 4 - # Wed Feb 21 16:48:01 2007 3 + # Linux kernel version: 2.6.21-rc6 4 + # Mon Apr 9 10:12:58 2007 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_SYS_SUPPORTS_APM_EMULATION=y 8 + CONFIG_GENERIC_GPIO=y 8 9 # CONFIG_GENERIC_TIME is not set 9 10 CONFIG_MMU=y 10 11 CONFIG_NO_IOPORT=y ··· 46 45 # CONFIG_IKCONFIG is not set 47 46 CONFIG_SYSFS_DEPRECATED=y 48 47 # CONFIG_RELAY is not set 48 + CONFIG_BLK_DEV_INITRD=y 49 49 CONFIG_INITRAMFS_SOURCE="" 50 50 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 51 51 CONFIG_SYSCTL=y ··· 533 531 CONFIG_BLK_DEV_RAM_COUNT=16 534 532 CONFIG_BLK_DEV_RAM_SIZE=4096 535 533 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 536 - CONFIG_BLK_DEV_INITRD=y 537 534 # CONFIG_CDROM_PKTCDVD is not set 538 535 CONFIG_ATA_OVER_ETH=m 539 536 ··· 561 560 CONFIG_BLK_DEV_IDE_BAST=y 562 561 # CONFIG_IDE_CHIPSETS is not set 563 562 # CONFIG_BLK_DEV_IDEDMA is not set 564 - # CONFIG_IDEDMA_AUTO is not set 565 563 # CONFIG_BLK_DEV_HD is not set 566 564 567 565 # ··· 941 941 # LED drivers 942 942 # 943 943 CONFIG_LEDS_S3C24XX=m 944 + CONFIG_LEDS_H1940=m 944 945 945 946 # 946 947 # LED Triggers ··· 1126 1125 # CONFIG_USB_APPLEDISPLAY is not set 1127 1126 # CONFIG_USB_LD is not set 1128 1127 # CONFIG_USB_TRANCEVIBRATOR is not set 1128 + # CONFIG_USB_IOWARRIOR is not set 1129 1129 # CONFIG_USB_TEST is not set 1130 1130 1131 1131 # ··· 1171 1169 # CONFIG_RTC_DRV_DS1672 is not set 1172 1170 # CONFIG_RTC_DRV_DS1742 is not set 1173 1171 # CONFIG_RTC_DRV_PCF8563 is not set 1174 - # CONFIG_RTC_DRV_PCF8583 is not set 1175 1172 # CONFIG_RTC_DRV_RS5C348 is not set 1176 1173 # CONFIG_RTC_DRV_RS5C372 is not set 1177 1174 CONFIG_RTC_DRV_S3C=y

+96 -3

arch/arm/tools/mach-types

··· 12 12 # 13 13 # http://www.arm.linux.org.uk/developer/machines/?action=new 14 14 # 15 - # Last update: Tue Jan 16 16:52:56 2007 15 + # Last update: Mon Apr 16 21:01:04 2007 16 16 # 17 17 # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number 18 18 # ··· 1190 1190 bug MACH_BUG BUG 1179 1191 1191 mx33ads MACH_MX33ADS MX33ADS 1180 1192 1192 chub MACH_CHUB CHUB 1181 1193 - gta01 MACH_GTA01 GTA01 1182 1193 + neo1973_gta01 MACH_NEO1973_GTA01 NEO1973_GTA01 1182 1194 1194 w90n740 MACH_W90N740 W90N740 1183 1195 1195 medallion_sa2410 MACH_MEDALLION_SA2410 MEDALLION_SA2410 1184 1196 1196 ia_cpu_9200_2 MACH_IA_CPU_9200_2 IA_CPU_9200_2 1185 1197 1197 dimmrm9200 MACH_DIMMRM9200 DIMMRM9200 1186 1198 1198 pm9261 MACH_PM9261 PM9261 1187 1199 - mx21 MACH_MX21 MX21 1188 1200 1199 ml7304 MACH_ML7304 ML7304 1189 1201 1200 ucp250 MACH_UCP250 UCP250 1190 1202 1201 intboard MACH_INTBOARD INTBOARD 1191 ··· 1241 1242 tecon_tmezon MACH_TECON_TMEZON TECON_TMEZON 1231 1242 1243 zylonite MACH_ZYLONITE ZYLONITE 1233 1243 1244 gene1270 MACH_GENE1270 GENE1270 1234 1245 + zir2412 MACH_ZIR2412 ZIR2412 1235 1246 + mx31lite MACH_MX31LITE MX31LITE 1236 1247 + t700wx MACH_T700WX T700WX 1237 1248 + vf100 MACH_VF100 VF100 1238 1249 + nsb2 MACH_NSB2 NSB2 1239 1250 + nxhmi_bb MACH_NXHMI_BB NXHMI_BB 1240 1251 + nxhmi_re MACH_NXHMI_RE NXHMI_RE 1241 1252 + n4100pro MACH_N4100PRO N4100PRO 1242 1253 + sam9260 MACH_SAM9260 SAM9260 1243 1254 + omap_treo600 MACH_OMAP_TREO600 OMAP_TREO600 1244 1255 + indy2410 MACH_INDY2410 INDY2410 1245 1256 + nelt_a MACH_NELT_A NELT_A 1246 1257 + n311 MACH_N311 N311 1248 1258 + at91sam9260vgk MACH_AT91SAM9260VGK AT91SAM9260VGK 1249 1259 + at91leppe MACH_AT91LEPPE AT91LEPPE 1250 1260 + at91lepccn MACH_AT91LEPCCN AT91LEPCCN 1251 1261 + apc7100 MACH_APC7100 APC7100 1252 1262 + stargazer MACH_STARGAZER STARGAZER 1253 1263 + sonata MACH_SONATA SONATA 1254 1264 + schmoogie MACH_SCHMOOGIE SCHMOOGIE 1255 1265 + aztool MACH_AZTOOL AZTOOL 1256 1266 + mioa701 MACH_MIOA701 MIOA701 1257 1267 + sxni9260 MACH_SXNI9260 SXNI9260 1258 1268 + mxc27520evb MACH_MXC27520EVB MXC27520EVB 1259 1269 + armadillo5x0 MACH_ARMADILLO5X0 ARMADILLO5X0 1260 1270 + mb9260 MACH_MB9260 MB9260 1261 1271 + mb9263 MACH_MB9263 MB9263 1262 1272 + ipac9302 MACH_IPAC9302 IPAC9302 1263 1273 + cc9p9360js MACH_CC9P9360JS CC9P9360JS 1264 1274 + gallium MACH_GALLIUM GALLIUM 1265 1275 + msc2410 MACH_MSC2410 MSC2410 1266 1276 + ghi270 MACH_GHI270 GHI270 1267 1277 + davinci_leonardo MACH_DAVINCI_LEONARDO DAVINCI_LEONARDO 1268 1278 + oiab MACH_OIAB OIAB 1269 1279 + smdk6400 MACH_SMDK6400 SMDK6400 1270 1280 + nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 1281 + greenphone MACH_GREENPHONE GREENPHONE 1272 1282 + compex42x MACH_COMPEXWP18 COMPEXWP18 1273 1283 + xmate MACH_XMATE XMATE 1274 1284 + energizer MACH_ENERGIZER ENERGIZER 1275 1285 + ime1 MACH_IME1 IME1 1276 1286 + sweda_tms MACH_SWEDATMS SWEDATMS 1277 1287 + ntnp435c MACH_NTNP435C NTNP435C 1278 1288 + spectro2 MACH_SPECTRO2 SPECTRO2 1279 1289 + h6039 MACH_H6039 H6039 1280 1290 + ep80219 MACH_EP80219 EP80219 1281 1291 + samoa_ii MACH_SAMOA_II SAMOA_II 1282 1292 + cwmxl MACH_CWMXL CWMXL 1283 1293 + as9200 MACH_AS9200 AS9200 1284 1294 + sfx1149 MACH_SFX1149 SFX1149 1285 1295 + navi010 MACH_NAVI010 NAVI010 1286 1296 + multmdp MACH_MULTMDP MULTMDP 1287 1297 + scb9520 MACH_SCB9520 SCB9520 1288 1298 + htcathena MACH_HTCATHENA HTCATHENA 1289 1299 + xp179 MACH_XP179 XP179 1290 1300 + h4300 MACH_H4300 H4300 1291 1301 + goramo_mlr MACH_GORAMO_MLR GORAMO_MLR 1292 1302 + mxc30020evb MACH_MXC30020EVB MXC30020EVB 1293 1303 + adsbitsymx MACH_ADSBITSIMX ADSBITSIMX 1294 1304 + adsportalplus MACH_ADSPORTALPLUS ADSPORTALPLUS 1295 1305 + mmsp2plus MACH_MMSP2PLUS MMSP2PLUS 1296 1306 + em_x270 MACH_EM_X270 EM_X270 1297 1307 + tpp302 MACH_TPP302 TPP302 1298 1308 + tpp104 MACH_TPM104 TPM104 1299 1309 + tpm102 MACH_TPM102 TPM102 1300 1310 + tpm109 MACH_TPM109 TPM109 1301 1311 + fbxo1 MACH_FBXO1 FBXO1 1302 1312 + hxd8 MACH_HXD8 HXD8 1303 1313 + neo1973_gta02 MACH_NEO1973_GTA02 NEO1973_GTA02 1304 1314 + emtest MACH_EMTEST EMTEST 1305 1315 + ad6900 MACH_AD6900 AD6900 1306 1316 + europa MACH_EUROPA EUROPA 1307 1317 + metroconnect MACH_METROCONNECT METROCONNECT 1308 1318 + ez_s2410 MACH_EZ_S2410 EZ_S2410 1309 1319 + ez_s2440 MACH_EZ_S2440 EZ_S2440 1310 1320 + ez_ep9312 MACH_EZ_EP9312 EZ_EP9312 1311 1321 + ez_ep9315 MACH_EZ_EP9315 EZ_EP9315 1312 1322 + ez_x7 MACH_EZ_X7 EZ_X7 1313 1323 + godotdb MACH_GODOTDB GODOTDB 1314 1324 + mistral MACH_MISTRAL MISTRAL 1315 1325 + msm MACH_MSM MSM 1316 1326 + ct5910 MACH_CT5910 CT5910 1317 1327 + ct5912 MACH_CT5912 CT5912 1318 1328 + hynet_ine MACH_HYNET_INE HYNET_INE 1319 1329 + hynet_app MACH_HYNET_APP HYNET_APP 1320 1330 + msm7200 MACH_MSM7200 MSM7200 1321 1331 + msm7600 MACH_MSM7600 MSM7600 1322 1332 + ceb255 MACH_CEB255 CEB255 1323 1333 + ciel MACH_CIEL CIEL 1324 1334 + slm5650 MACH_SLM5650 SLM5650 1325 1335 + at91sam9rlek MACH_AT91SAM9RLEK AT91SAM9RLEK 1326 1336 + comtech_router MACH_COMTECH_ROUTER COMTECH_ROUTER 1327 1337 + sbc2410x MACH_SBC2410X SBC2410X 1328 1338 + at4x0bd MACH_AT4X0BD AT4X0BD 1329