The patch titled mmc-sd-host-driver-for-ricoh-bay1controllers-fix 2 has been removed from the -mm tree. Its filename was mmc-sd-host-driver-for-ricoh-bay1controllers-fix-2.patch This patch was dropped because it was folded into mmc-sd-host-driver-for-ricoh-bay1controllers.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mmc-sd-host-driver-for-ricoh-bay1controllers-fix 2 From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> CONFIG_PM=n: ERROR: "mmc_resume_host" [drivers/mmc/host/sdricoh_cs.ko] undefined! ERROR: "mmc_suspend_host" [drivers/mmc/host/sdricoh_cs.ko] undefined! Cc: Sascha Sommer <saschasommer@xxxxxxxxxx> Cc: Pierre Ossman <drzeus-list@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/sdricoh_cs.c | 5 +++++ 1 file changed, 5 insertions(+) diff -puN drivers/mmc/host/sdricoh_cs.c~mmc-sd-host-driver-for-ricoh-bay1controllers-fix-2 drivers/mmc/host/sdricoh_cs.c --- a/drivers/mmc/host/sdricoh_cs.c~mmc-sd-host-driver-for-ricoh-bay1controllers-fix-2 +++ a/drivers/mmc/host/sdricoh_cs.c @@ -572,6 +572,7 @@ static void sdricoh_pcmcia_detach(struct } +#ifdef CONFIG_PM static int sdricoh_pcmcia_suspend(struct pcmcia_device *link) { struct mmc_host *mmc = link->priv; @@ -588,6 +589,10 @@ static int sdricoh_pcmcia_resume(struct mmc_resume_host(mmc); return 0; } +#else +#define sdricoh_pcmcia_suspend NULL +#define sdricoh_pcmcia_resume NULL +#endif static struct pcmcia_driver sdricoh_driver = { .drv = { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch tty_check_change-avoid-taking-tasklist_lock-while-holding-tty-ctrl_lock.patch net-irda-irnet-irnet_irdac-needs-unalignedh.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch revert-9p-convert-from-semaphore-to-spinlock.patch fix-kobject-fix-kobject_rename-and-config_sysfs.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch acpi-video-balcklist-fujitsu-lifebook-s6410.patch revert-acpica-fixes-for-unload-and-ddbhandles.patch git-x86-fixup.patch arch-x86-mm-patc-use-boot_cpu_has.patch x86-setup_force_cpu_cap-dont-do-clear_bitnon-unsigned-long.patch lguest-use-cpu-capability-accessors.patch x86-set_restore_sigmask-avoid-bitop-on-a-u32.patch x86-bitops-take-an-unsigned-long.patch arm-omap1-n770-convert-audio_pwr_sem-in-a-mutex.patch audit_send_reply-fix-error-path-memory-leak.patch cifs-suppress-warning.patch sysfs-provide-a-clue-about-the-effects-of-config_usb_device_class=y.patch zoran-use-correct-type-for-cpu-flags.patch i2c-renesas-highlander-fpga-smbus-support.patch drivers-infiniband-hw-mlx4-qpc-fix-uninitialised-var-warning.patch git-input.patch git-jg-misc-git-rejects.patch drivers-scsi-broadsasc-fix-uninitialised-var-warning.patch mmc-sd-host-driver-for-ricoh-bay1controllers.patch mmc-sd-host-driver-for-ricoh-bay1controllers-fix-2.patch git-ubifs.patch hysdn-no-longer-broken-on-smp.patch sundance-set-carrier-status-on-link-change-events.patch dm9000-use-delayed-work-to-update-mii-phy-state-fix.patch pcnet32-fix-warning.patch drivers-net-tokenring-3c359c-squish-a-warning.patch drivers-net-tokenring-olympicc-fix-warning.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-battery.patch fs-nfs-callback_xdrc-suppress-uninitialiized-variable-warnings.patch arch-parisc-kernel-unalignedc-use-time_-macros.patch selinux-dopey-hack.patch pci-hotplug-introduce-pci_slot.patch pci-hotplug-acpi-pci-slot-detection-driver.patch drivers-scsi-qla2xxx-qla_osc-suppress-uninitialized-var-warning.patch s390-uninline-spinlock-functions-which-use-smp_processor_id.patch git-unionfs.patch git-unionfs-fixup.patch git-logfs-fixup.patch drivers-uwb-nehc-processor-flags-have-type-unsigned-long.patch drivers-usb-host-isp1760-hcdc-procesxor-flags-have-type-unsigned-long.patch uwb-fix-scscanf-warning.patch drivers-uwb-wlp-sysfsc-dead-code.patch drivers-uwb-i1480-dfu-macc-fix-min-warning.patch drivers-uwb-i1480-dfu-usbc-fix-size_t-confusion.patch drivers-uwb-whcic-needs-dma-mappingh.patch rndis-switch-to-seq_files-checkpatch-fixes.patch git-v9fs.patch revert-git-v9fs.patch git-watchdog.patch git-watchdog-git-rejects.patch watchdog-fix-booke_wdtc-on-mpc85xx-smp-system.patch wireless-fix-iwlwifi-unify-init-driver-flow.patch xfs-suppress-uninitialized-var-warnings.patch git-xtensa.patch git-orion-git-rejects.patch ibmaem-new-driver-for-power-energy-temp-meters-in-ibm-system-x-hardware-ia64-warnings.patch scsi-dpt_i2o-is-bust-on-ia64.patch colibri-fix-support-for-dm9000-ethernet-device-fix.patch mm-verify-the-page-links-and-memory-model.patch mspec-convert-nopfn-to-fault-fix.patch page-allocator-inlnie-some-__alloc_pages-wrappers-fix.patch kill-generic_file_direct_io-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch split-the-typecheck-macros-out-of-include-linux-kernelh.patch locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch locking-add-typecheck-on-irqsave-and-friends-for-correct-flags-fix.patch remove-apparently-unused-fd1772h-header-file.patch lib-allow-memparse-to-accept-a-null-and-ignorable-second-parm-checkpatch-fixes.patch rename-warn-to-warning-to-clear-the-namespace-fix.patch add-a-warn-macro-this-is-warn_on-printk-arguments-fix.patch flag-parameters-paccept-fix.patch flag-parameters-paccept-sys_ni.patch flag-parameters-anon_inode_getfd-extension-fix.patch flag-parameters-signalfd-fix.patch flag-parameters-eventfd-fix.patch flag-parameters-inotify_init-fix.patch flag-parameters-check-magic-constants-alpha-hack.patch drivers-video-aty-radeon_basec-notify-user-if-sysfs_create_bin_file-failed-checkpatch-fixes.patch reiserfs-convert-j_flush_sem-to-mutex-fix.patch reiserfs-convert-j_commit_lock-to-mutex-checkpatch-fixes.patch documentation-build-source-files-in-documentation-sub-dir-disable.patch ppc-use-the-common-ascii-hex-helpers-fix.patch reiser4.patch reiser4-semaphore-fix.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-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