aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-08-31 23:59:37 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-31 23:59:37 -0400
commit5110bd21b8af4199b8332c0ab0b23367556653d3 (patch)
treefcd655bb454ee7b0382aa200d9a2e160465ac6ae /drivers
parentb69416b51be0757c82f1c5a0a3f0995a4484dab4 (diff)
sparc: remove CONFIG_SUN4
While doing some easy cleanups on the sparc code I noticed that the CONFIG_SUN4 code seems to be worse than the rest - there were some "I don't know how it should work, but the current code definitely cannot work." places. And while I have seen people running Linux on machines like a SPARCstation 5 a few years ago I don't recall having seen sun4 machines, even less ones running Linux. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/Kconfig1
-rw-r--r--drivers/net/sunlance.c42
2 files changed, 0 insertions, 43 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ae8494944c45..55d7ee4e92b4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -7,7 +7,6 @@ menuconfig ATA
7 depends on HAS_IOMEM 7 depends on HAS_IOMEM
8 depends on BLOCK 8 depends on BLOCK
9 depends on !(M32R || M68K) || BROKEN 9 depends on !(M32R || M68K) || BROKEN
10 depends on !SUN4 || BROKEN
11 select SCSI 10 select SCSI
12 ---help--- 11 ---help---
13 If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or 12 If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 30cdb81853b4..704301a5a7ff 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1502,43 +1502,6 @@ fail:
1502 return -ENODEV; 1502 return -ENODEV;
1503} 1503}
1504 1504
1505#ifdef CONFIG_SUN4
1506
1507#include <asm/sun4paddr.h>
1508#include <asm/machines.h>
1509
1510/* Find all the lance cards on the system and initialize them */
1511static struct sbus_dev sun4_sdev;
1512static int __devinit sparc_lance_init(void)
1513{
1514 if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) ||
1515 (idprom->id_machtype == (SM_SUN4|SM_4_470))) {
1516 memset(&sun4_sdev, 0, sizeof(struct sbus_dev));
1517 sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;
1518 sun4_sdev.irqs[0] = 6;
1519 return sparc_lance_probe_one(&sun4_sdev, NULL, NULL);
1520 }
1521 return -ENODEV;
1522}
1523
1524static int __exit sunlance_sun4_remove(void)
1525{
1526 struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev);
1527 struct net_device *net_dev = lp->dev;
1528
1529 unregister_netdev(net_dev);
1530
1531 lance_free_hwresources(lp);
1532
1533 free_netdev(net_dev);
1534
1535 dev_set_drvdata(&sun4_sdev.ofdev.dev, NULL);
1536
1537 return 0;
1538}
1539
1540#else /* !CONFIG_SUN4 */
1541
1542static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match) 1505static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
1543{ 1506{
1544 struct of_device *parent = to_of_device(op->dev.parent); 1507 struct of_device *parent = to_of_device(op->dev.parent);
@@ -1593,15 +1556,10 @@ static int __init sparc_lance_init(void)
1593{ 1556{
1594 return of_register_driver(&sunlance_sbus_driver, &of_bus_type); 1557 return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
1595} 1558}
1596#endif /* !CONFIG_SUN4 */
1597 1559
1598static void __exit sparc_lance_exit(void) 1560static void __exit sparc_lance_exit(void)
1599{ 1561{
1600#ifdef CONFIG_SUN4
1601 sunlance_sun4_remove();
1602#else
1603 of_unregister_driver(&sunlance_sbus_driver); 1562 of_unregister_driver(&sunlance_sbus_driver);
1604#endif
1605} 1563}
1606 1564
1607module_init(sparc_lance_init); 1565module_init(sparc_lance_init);