Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7ce663 authored Mar 16, 2013 by Paul Bolle Committed by Stefan Richter Apr 28, 2013

firewire: Remove two unneeded checks for macros



The old IEEE 1394 driver stack was removed in v2.6.37. That made the
checks for two Kconfig (module) macros unneeded, since they will now
always evaluate to true. Remove these two checks.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

parent 60d509fa

drivers/firewire/ohci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3837,6 +3837,4 @@ MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
		MODULE_LICENSE("GPL");

		/* Provide a module alias so root-on-sbp2 initrds don't break. */
		#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
		MODULE_ALIAS("ohci1394");
		#endif

drivers/firewire/sbp2.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1636,9 +1636,7 @@ MODULE_LICENSE("GPL");
		MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);

		/* Provide a module alias so root-on-sbp2 initrds don't break. */
		#ifndef CONFIG_IEEE1394_SBP2_MODULE
		MODULE_ALIAS("sbp2");
		#endif

		static int __init sbp2_init(void)
		{