- m68k-atyfb_base-compile-fix-for-config_pci=n.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     m68k: atyfb_base compile fix for CONFIG_PCI=n

has been removed from the -mm tree.  Its filename is

     m68k-atyfb_base-compile-fix-for-config_pci=n.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: m68k: atyfb_base compile fix for CONFIG_PCI=n
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>


The atyfb_driver structure is only available if CONFIG_PCI is set.

Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/video/aty/atyfb_base.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN drivers/video/aty/atyfb_base.c~m68k-atyfb_base-compile-fix-for-config_pci=n drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/atyfb_base.c~m68k-atyfb_base-compile-fix-for-config_pci=n
+++ a/drivers/video/aty/atyfb_base.c
@@ -3722,7 +3722,9 @@ static int __init atyfb_init(void)
     atyfb_setup(option);
 #endif
 
+#ifdef CONFIG_PCI
     pci_register_driver(&atyfb_driver);
+#endif
 #ifdef CONFIG_ATARI
     atyfb_atari_probe();
 #endif
@@ -3731,7 +3733,9 @@ static int __init atyfb_init(void)
 
 static void __exit atyfb_exit(void)
 {
+#ifdef CONFIG_PCI
 	pci_unregister_driver(&atyfb_driver);
+#endif
 }
 
 module_init(atyfb_init);
_

Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are

origin.patch
git-kbuild.patch
64-bit-resources-kconfig-change.patch
affs_fill_super-%s-abuses-2.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-and-optimize-clock-source-update.patch
fix-rt-mutex-defaults-and-dependencies.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux