Fix broken compilation when build against a 2.6.18 kernel (#148524)

(Portage version: 2.1.1)
 (Signed Manifest commit)

2 files changed, 15 insertions, 36 deletions

diff --git a/net-dialup/ltmodem/Manifest b/net-dialup/ltmodem/Manifest
index 836385f9ac26..0423080ecee2 100644
--- a/net-dialup/ltmodem/Manifest
+++ b/net-dialup/ltmodem/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ltmodem-2.6-alk-8-module_param.patch 836 RMD160 a7a330f991dfb052561128608a19506846a65f2e SHA1 460721cc532945e61e050abf977e7464a4bd367c SHA256 6fa9d399f5532bd0d536662469a9123b70152d9f5d9cabafb525aef5cbd274ad
-MD5 56e9b5e79f20ba5f7a02d87a0932da53 files/ltmodem-2.6-alk-8-module_param.patch 836
-RMD160 a7a330f991dfb052561128608a19506846a65f2e files/ltmodem-2.6-alk-8-module_param.patch 836
-SHA256 6fa9d399f5532bd0d536662469a9123b70152d9f5d9cabafb525aef5cbd274ad files/ltmodem-2.6-alk-8-module_param.patch 836
+AUX ltmodem-2.6-alk-8-kernel-changes.patch 1261 RMD160 07b4e6c6ed0e9fdfbb90ed11770c846edf8393d5 SHA1 8f55081c80ca765d5daedeb9c1a6eb2ce0f614d1 SHA256 f6d7b8d3a905cc976b3c6d3f45a7768182a726121806b95d1454d61eb7027a83
+MD5 42840363c2ada888ac481027b383b1aa files/ltmodem-2.6-alk-8-kernel-changes.patch 1261
+RMD160 07b4e6c6ed0e9fdfbb90ed11770c846edf8393d5 files/ltmodem-2.6-alk-8-kernel-changes.patch 1261
+SHA256 f6d7b8d3a905cc976b3c6d3f45a7768182a726121806b95d1454d61eb7027a83 files/ltmodem-2.6-alk-8-kernel-changes.patch 1261
 AUX ltmodem_devfs 198 RMD160 7ee64ee62bb18124a4facd21bd76055fd4d8020d SHA1 d704f9fac0dbbcc9b5e6d0d9d430a59de8a02e41 SHA256 0ffed3039c0fa35e9f7b5a1c31c8dbf91d6ac3190c9df24aa2cd483ee001e0a1
 MD5 b990e7d5303c86f37ea21cf471d22e03 files/ltmodem_devfs 198
 RMD160 7ee64ee62bb18124a4facd21bd76055fd4d8020d files/ltmodem_devfs 198
@@ -15,14 +15,14 @@ RMD160 77fcc7ad359f1a80c63b8d3dbdd2a65c7375fb2b files/ltmodem_udev 183
 SHA256 af14018c5c6e9fc6dcb87ef1abf737296354b8fb5cd59d773d723e3d46b9963c files/ltmodem_udev 183
 DIST ltmodem-2.6-alk-8.tar.bz2 436392 RMD160 20a1c41ea5cf836895ae6e2e43acacf45716e0aa SHA1 f150e3065584bf5b2aa913c433dc7efcd0a9dd2e SHA256 262c407471ccaafb7a6b0e7a3df41e37b1d1e6cdf34bd0e1567aac102cf277b6
 DIST ltmodem-8.31a10.tar.gz 580518 RMD160 0dfc43b700a3d806ed0d29e2d3470cc4679a2bb4 SHA1 c93437879f603b9922e882b309f365f3863f746b SHA256 877c10fb668e92d86cdc4eaf0d675047edbfb0654d74b092189a936212f62b10
-EBUILD ltmodem-8.31_alpha10-r3.ebuild 3889 RMD160 3a2474832452447503ebc7270b93c02379f61750 SHA1 1dbb8cc0039160b14c37272c5708567b7cee2b86 SHA256 5cd22ce0154bcd2c2e38c1cf8f4dab9420069f2b32280b97d62175f623efd6a6
-MD5 b88168dfafba032300b26b7c9ad5d9ea ltmodem-8.31_alpha10-r3.ebuild 3889
-RMD160 3a2474832452447503ebc7270b93c02379f61750 ltmodem-8.31_alpha10-r3.ebuild 3889
-SHA256 5cd22ce0154bcd2c2e38c1cf8f4dab9420069f2b32280b97d62175f623efd6a6 ltmodem-8.31_alpha10-r3.ebuild 3889
-MISC ChangeLog 4186 RMD160 023f2cf523a18b1d80049fa085b8721032add50f SHA1 911edb67c8c6edc13ae757b4d19a3b6378216d18 SHA256 6bf115198c25a7903289ca2cc1fe1904dac6f6b05a967b7d6600961b97d70d74
-MD5 94bdbe82f4918ccf2ec3c55f1e1afa11 ChangeLog 4186
-RMD160 023f2cf523a18b1d80049fa085b8721032add50f ChangeLog 4186
-SHA256 6bf115198c25a7903289ca2cc1fe1904dac6f6b05a967b7d6600961b97d70d74 ChangeLog 4186
+EBUILD ltmodem-8.31_alpha10-r3.ebuild 3893 RMD160 49751a87a40296daec919f51fa03cb2d7736b422 SHA1 25a99830d5c9fba73143b49902a457d6d0e96ce4 SHA256 fba9614c17e9f5d6a831f95157da41ff175eb7be119b64bc442f7ad4bbe2cd1f
+MD5 cce51c543aeb07d692ff76ae4130346c ltmodem-8.31_alpha10-r3.ebuild 3893
+RMD160 49751a87a40296daec919f51fa03cb2d7736b422 ltmodem-8.31_alpha10-r3.ebuild 3893
+SHA256 fba9614c17e9f5d6a831f95157da41ff175eb7be119b64bc442f7ad4bbe2cd1f ltmodem-8.31_alpha10-r3.ebuild 3893
+MISC ChangeLog 4435 RMD160 3a789bca0eda0c6de173efbf863fd65f702dd14e SHA1 4ab6bce892a63742bc6b9c7d77895a91be91b875 SHA256 782beacb1e68c3377189da04e6608e21ce4308ed71f23864c8c040bd0ddbc992
+MD5 84be86c13b47bfe257ab1a72d28f30bc ChangeLog 4435
+RMD160 3a789bca0eda0c6de173efbf863fd65f702dd14e ChangeLog 4435
+SHA256 782beacb1e68c3377189da04e6608e21ce4308ed71f23864c8c040bd0ddbc992 ChangeLog 4435
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -33,7 +33,7 @@ SHA256 0047612953a721ec98fdafbbdcc15e4ddc34fe0e84085f001430219b0da705a6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAp7e3sf9c6kjmR8RAotVAJ0c0WJqPydOy47PfcStYwp1EPjEbQCgo7QE
-Fd54eaPpY8Y5N9YZqyBWU7A=
-=VHTK
+iD8DBQFFEuMC3sf9c6kjmR8RAvvxAKCFLZRAIVHWvcq9v6z+ii9o1hYFNwCeODj0
+js30yE0Og80Dd7Xv8cFz060=
+=st+2
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-module_param.patch b/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-module_param.patch
deleted file mode 100644
index aae5f1e63f30..000000000000
--- a/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-module_param.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru ltmodem-2.6-alk-8.orig/lt_modem.c ltmodem-2.6-alk-8/lt_modem.c
---- ltmodem-2.6-alk-8.orig/lt_modem.c	2005-12-12 03:18:55.000000000 +0200
-+++ ltmodem-2.6-alk-8/lt_modem.c	2006-04-19 21:43:32.142640500 +0300
-@@ -120,14 +120,14 @@
- static int vendor_id = 0;
- static int device_id = 0;
- 
--MODULE_PARM(vendor_id, "i");
-+module_param(vendor_id, int, 0);
- MODULE_PARM_DESC(vendor_id, "Vendor ID of the Lucent Modem e.g. vendor_id=0x11c1");
--MODULE_PARM(device_id, "i");
-+module_param(device_id, int, 0);
- MODULE_PARM_DESC(device_id, "Device ID of the Lucent Modem e.g. device_id=0x0440");
- 
- static int Forced[4] = {-1,-1,-1,0};
- 
--MODULE_PARM(Forced, "4i");
-+module_param_array(Forced, int, NULL, 0);
- MODULE_PARM_DESC(Forced, "Forced Irq,BaseAddress,ComAddress[,NoDetect] of the Lucent Modem e.g. Forced=3,0x130,0x2f8");
- 
- static