Author: tbm
Date: Wed Apr 25 15:09:58 2007
New Revision: 8511
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/mach-types.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Take arch/arm/tools/mach-types from current git to fix build failure
because MACH_TYPE_EP80219 is not defined.
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Apr 25 15:09:58 2007
@@ -15,6 +15,8 @@
* Add armel (arm with EABI) support. Thanks, Lennert Buytenhek and
Joey Hess. Closes: #410853.
* Mark CHELSIO_T3 as broken on ARM.
+ * Take arch/arm/tools/mach-types from current git to fix build failure
+ because MACH_TYPE_EP80219 is not defined.
-- maximilian attems <[EMAIL PROTECTED]> Tue, 10 Apr 2007 14:42:30 +0200
Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/mach-types.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/mach-types.patch Wed Apr
25 15:09:58 2007
@@ -0,0 +1,137 @@
+Take arch/arm/tools/mach-types from current git to fix build failure:
+
+arch/arm/mach-iop32x/iq31244.c: In function ‘is_ep80219’:
+arch/arm/mach-iop32x/iq31244.c:58: warning: implicit declaration of function
‘machine_is_ep80219’
+arch/arm/mach-iop32x/iq31244.c: In function ‘iq31244_pci_init’:
+arch/arm/mach-iop32x/iq31244.c:190: error: ‘MACH_TYPE_EP80219’ undeclared
(first use in this function)
+arch/arm/mach-iop32x/iq31244.c:190: error: (Each undeclared identifier is
reported only once
+arch/arm/mach-iop32x/iq31244.c:190: error: for each function it appears in.)
+arch/arm/mach-iop32x/iq31244.c: At top level:
+arch/arm/mach-iop32x/iq31244.c:327: error: ‘MACH_TYPE_EP80219’ undeclared here
(not in a function)
+make[5]: *** [arch/arm/mach-iop32x/iq31244.o] Error 1
+
+
+--- linux-2.6-2.6.21~rc7/arch/arm/tools/mach-types 2007-02-04
18:44:54.000000000 +0000
++++ git/arch/arm/tools/mach-types 2007-04-24 16:42:54.000000000 +0000
+@@ -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 @@
+ 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 @@
+ 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
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Wed Apr
25 15:09:58 2007
@@ -41,3 +41,6 @@
+ bugfix/forcedeth-napi-broken.patch
+ bugfix/powerpc/drivers_macintosh-broken.patch
+ bugfix/ia64/hardcode-arch-script-output.patch
+
+# The following patches will be in 2.6.21-rc8
++ bugfix/arm/mach-types.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
