The patch titled
ISDN: make ICN not autograb when builtin
has been removed from the -mm tree. Its filename was
isdn-make-icn-not-autograb-when-builtin.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ISDN: make ICN not autograb when builtin
From: Rene Herman <rene.herman@xxxxxxxxxxxx>
The old ISDN ICN legacy ISA driver was found to break the boot during Ingo
Molnar's testing of randconfig kernels by grabbing bus resources even
without the hardware present. Insist that the (existing) icn=io parameter
be specified when builtin so as to avoid such.
This is a deprecated driver (stack, even) and highly likely unused.
Nothing changes modular moreover.
Signed-off-by: Rene Herman <rene.herman@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Karsten Keil <kkeil@xxxxxxx>
Cc: Fritz Elfert <fritz@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/isdn/icn/icn.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff -puN drivers/isdn/icn/icn.c~isdn-make-icn-not-autograb-when-builtin drivers/isdn/icn/icn.c
--- a/drivers/isdn/icn/icn.c~isdn-make-icn-not-autograb-when-builtin
+++ a/drivers/isdn/icn/icn.c
@@ -1596,6 +1596,8 @@ icn_addcard(int port, char *id1, char *i
}
#ifndef MODULE
+static int enable;
+
static int __init
icn_setup(char *line)
{
@@ -1605,8 +1607,10 @@ icn_setup(char *line)
static char sid2[20];
str = get_options(line, 2, ints);
- if (ints[0])
+ if (ints[0]) {
portbase = ints[1];
+ enable = 1;
+ }
if (ints[0] > 1)
membase = (unsigned long)ints[2];
if (str && *str) {
@@ -1628,6 +1632,12 @@ static int __init icn_init(void)
char *p;
char rev[10];
+#ifndef MODULE
+ if (!enable) {
+ printk(KERN_INFO "ICN: please specify io\n");
+ return -ENODEV;
+ }
+#endif
memset(&dev, 0, sizeof(icn_dev));
dev.memaddr = (membase & 0x0ffc000);
dev.channel = -1;
_
Patches currently in -mm which might be from rene.herman@xxxxxxxxxxxx are
v4l1-make-pms-not-autoprobe-when-builtin.patch
v4l1-make-pms-not-autoprobe-when-builtin-update.patch
isdn-make-icn-not-autograb-when-builtin.patch
pnp-make-the-resource-type-an-unsigned-long.patch
pnp-make-the-resource-type-an-unsigned-long-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
