diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-16 14:09:07 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-04-28 23:36:43 +0200 |
| commit | df7ce66363bf66b2e8ef6245f5f42c2f6fb0db52 (patch) | |
| tree | f5d2f273b2f2ef2a35968eda2b1ef1ca275bca88 /drivers/firewire | |
| parent | 60d509fa6a9c4653a86ad830e4c4b30360b23f0e (diff) | |
| download | linux-df7ce66363bf66b2e8ef6245f5f42c2f6fb0db52.tar.gz linux-df7ce66363bf66b2e8ef6245f5f42c2f6fb0db52.tar.bz2 linux-df7ce66363bf66b2e8ef6245f5f42c2f6fb0db52.zip | |
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>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/ohci.c | 2 | ||||
| -rw-r--r-- | drivers/firewire/sbp2.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 45912e6e0ac2..4a55b519b773 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -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 diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 1162d6b3bf85..12ec0e6fd09e 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -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) { |