The patch titled
fix ISTALLION=y
has been added to the -mm tree. Its filename is
fix-istallion=y.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix ISTALLION=y
From: Adrian Bunk <bunk@xxxxxxxxx>
drivers/char/istallion.c: In function â??stli_initbrdsâ??:
drivers/char/istallion.c:4150: error: implicit declaration of function â??stli_parsebrdâ??
drivers/char/istallion.c:4150: error: â??stli_brdspâ?? undeclared (first use in this function)
drivers/char/istallion.c:4150: error: (Each undeclared identifier is reported only once
drivers/char/istallion.c:4150: error: for each function it appears in.)
drivers/char/istallion.c:4164: error: implicit declaration of function â??stli_argbrdsâ??
While I was at it, I also removed the #ifdef MODULE around the initialation
code to allow it to perhaps work when built into the kernel and made a
needlessly global function static.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/istallion.c | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff -puN drivers/char/istallion.c~fix-istallion=y drivers/char/istallion.c
--- a/drivers/char/istallion.c~fix-istallion=y
+++ a/drivers/char/istallion.c
@@ -283,7 +283,6 @@ static char *stli_brdnames[] = {
/*****************************************************************************/
-#ifdef MODULE
/*
* Define some string labels for arguments passed from the module
* load line. These allow for easy board definitions, and easy
@@ -382,8 +381,6 @@ MODULE_PARM_DESC(board2, "Board 2 config
module_param_array(board3, charp, NULL, 0);
MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
-#endif
-
/*
* Set up a default memory address table for EISA board probing.
* The default addresses are all bellow 1Mbyte, which has to be the
@@ -644,14 +641,8 @@ static unsigned int stli_baudrates[] = {
* Prototype all functions in this driver!
*/
-#ifdef MODULE
-static void stli_argbrds(void);
static int stli_parsebrd(stlconf_t *confp, char **argp);
-
-static unsigned long stli_atol(char *str);
-#endif
-
-int stli_init(void);
+static int stli_init(void);
static int stli_open(struct tty_struct *tty, struct file *filp);
static void stli_close(struct tty_struct *tty, struct file *filp);
static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -787,8 +778,6 @@ static int stli_timeron;
static struct class *istallion_class;
-#ifdef MODULE
-
/*
* Loadable module initialization stuff.
*/
@@ -958,8 +947,6 @@ static int stli_parsebrd(stlconf_t *conf
return(1);
}
-#endif
-
/*****************************************************************************/
static int stli_open(struct tty_struct *tty, struct file *filp)
@@ -4698,7 +4685,7 @@ static struct tty_operations stli_ops =
/*****************************************************************************/
-int __init stli_init(void)
+static int __init stli_init(void)
{
int i;
printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
fix-istallion=y.patch
git-acpi.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
git-agpgart.patch
the-scheduled-unexport-of-insert_resource.patch
remove-kernel-power-pmcpm_unregister_all.patch
git-gfs2.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
fs-jffs2-make-2-functions-static.patch
ni5010-netcard-cleanup-fix.patch
drivers-dma-iovlockc-make-num_pages_spanned-static.patch
drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch
fix-the-au1000_fir-dependencies.patch
fs-nfs-make-2-functions-static.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-arcmsr-cleanups.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
drivers-message-fusion-mptsasc-make-2-functions-static.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
fix-the-init_env_arg_limit-dependencies.patch
show-acorn-specific-block-devices-menu-only-when-required.patch
drivers-cdrom-cm206c-cleanups.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag-tidy.patch
task-watchers-register-semundo-task-watcher-cleanup.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
lockdep-core.patch
srcu-add-srcu-operations-to-rcutorture-tidy-2.patch
the-scheduled-removal-of-some-oss-drivers.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.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
