The patch titled
drivers/cdrom/cm206.c: cleanups
has been added to the -mm tree. Its filename is
drivers-cdrom-cm206c-cleanups.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/cdrom/cm206.c: cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- make __cm206_init() __init (required since it calls
the __init cm206_init())
- make the needlessly global bcdbin() static
- remove a comment with an obsolete compile command
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/cdrom/cm206.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff -puN drivers/cdrom/cm206.c~drivers-cdrom-cm206c-cleanups drivers/cdrom/cm206.c
--- a/drivers/cdrom/cm206.c~drivers-cdrom-cm206c-cleanups
+++ a/drivers/cdrom/cm206.c
@@ -915,7 +915,7 @@ static void seek(int lba)
cd->dsb = wait_dsb();
}
-uch bcdbin(unsigned char bcd)
+static uch bcdbin(unsigned char bcd)
{ /* stolen from mcd.c! */
return (bcd >> 4) * 10 + (bcd & 0xf);
}
@@ -1533,7 +1533,7 @@ static void __init parse_options(void)
}
}
-static int __cm206_init(void)
+static int __init __cm206_init(void)
{
parse_options();
#if !defined(AUTO_PROBE_MODULE)
@@ -1594,8 +1594,3 @@ __setup("cm206=", cm206_setup);
#endif /* !MODULE */
MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR);
-/*
- * Local variables:
- * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DMODULE -DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h -c -o cm206.o cm206.c"
- * End:
- */
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.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
