The patch titled wireless/ipw2200.c: add __dev{init,exit} annotations has been removed from the -mm tree. Its filename was wireless-ipw2200c-add-__devinitexit-annotations.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: wireless/ipw2200.c: add __dev{init,exit} annotations From: Adrian Bunk <bunk@xxxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Acked-by: Zhu Yi <yi.zhu@xxxxxxxxx> Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/ipw2200.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/net/wireless/ipw2200.c~wireless-ipw2200c-add-__devinitexit-annotations drivers/net/wireless/ipw2200.c --- a/drivers/net/wireless/ipw2200.c~wireless-ipw2200c-add-__devinitexit-annotations +++ a/drivers/net/wireless/ipw2200.c @@ -10751,7 +10751,7 @@ static void ipw_bg_link_down(struct work mutex_unlock(&priv->mutex); } -static int ipw_setup_deferred_work(struct ipw_priv *priv) +static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv) { int ret = 0; @@ -11600,7 +11600,8 @@ static void ipw_prom_free(struct ipw_pri #endif -static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +static int __devinit ipw_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { int err = 0; struct net_device *net_dev; @@ -11767,7 +11768,7 @@ static int ipw_pci_probe(struct pci_dev return err; } -static void ipw_pci_remove(struct pci_dev *pdev) +static void __devexit ipw_pci_remove(struct pci_dev *pdev) { struct ipw_priv *priv = pci_get_drvdata(pdev); struct list_head *p, *q; _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are origin.patch git-acpi.patch git-dvb.patch git-gfs2-nmw.patch git-mtd.patch git-net.patch git-netdev-all.patch git-battery.patch drivers-bluetooth-bpa10xc-fix-memleak.patch drivers-bluetooth-btsdioc-fix-double-free.patch drivers-pci-msic-move-arch-hooks-to-the-top.patch if-0-pci_cleanup_aer_correct_error_status.patch git-scsi-misc.patch scsi-advansysc-make-3-functions-static.patch scsi-qla2xxx-possible-cleanups.patch scsi-qla2xxx-qla_osc-section-fix.patch scsi-megaraidc-__devexit-annotation.patch scsi-aic94xx-cleanups.patch scsi-aic94xx-cleanups-checkpatch-fixes.patch scsi-aic94xx-cleanups-checkpatch-fixes-checkpatch-fixes.patch git-x86.patch git-cryptodev.patch git-xtensa.patch mm-page-writebackc-make-a-function-static.patch make-__vmalloc_area_node-static.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch nubus-kill-drivers-nubus-nubus_symsc.patch m68k-kill-arch-m68k-mac-mac_ksymsc.patch m68k-kill-arch-m68k-hp300-ksymsc.patch m68k-kill-arch-m68k-amiga-amiga_ksymsc.patch m68k-kill-arch-m68k-atari-atari_ksymsc.patch m68k-kill-arch-m68k-mvme16x-mvme16x_ksymsc.patch kill-udffs_dateversion.patch make-ipc-utilcsysvipc_find_ipc-static.patch cleanup-after-apus-removal.patch remove-mm_ptovvtop.patch remove-__attribute_used__.patch remove-__attribute_used__-checkpatch-fixes.patch proper-show_interrupts-prototype.patch scheduled-oss-driver-removal.patch linux-inith-simplify-__meminitexit-dependencies.patch proper-prototype-for-signals_init.patch kernel-ptracec-should-include-linux-syscallsh.patch make-srcu_readers_active-static.patch kernel-notifierc-should-include-linux-rebooth.patch proper-prototype-for-get_filesystem_list.patch fs-utimesc-should-include-linux-syscallsh.patch fs-signalfdc-should-include-linux-syscallsh.patch fs-eventfdc-should-include-linux-syscallsh.patch proper-prototype-for-vty_init.patch drivers-misc-lkdtmc-cleanups.patch xen-fiddle_vdso-must-be-__init.patch calibrate_delay-must-be-__cpuinit.patch idle_regs-must-be-__cpuinit.patch fs-ecryptfs-possible-cleanups.patch make-video-geode-lxfb_corecgeode_modedb-static.patch video-hpfbc-section-fix.patch drivers-video-pm3fbc-section-fix.patch make-jbd-journalc__journal_abort_hard-static.patch move-edactxt-two-levels-up.patch remove-documentation-smptxt.patch kernel-cgroupc-remove-dead-code.patch kernel-cgroupc-make-2-functions-static.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch fix-m32r-__xchg.patch reiser4.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