summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/amd76xrom.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-07-30 14:37:43 +1000
committerDave Airlie <airlied@linux.ie>2005-07-30 14:37:43 +1000
commitbdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch)
treedc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /drivers/mtd/maps/amd76xrom.c
parent836cf0465c422ee6d654060edd7c620d9cf0c09c (diff)
parentb0825488a642cadcf39709961dde61440cb0731c (diff)
downloadop-kernel-dev-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip
op-kernel-dev-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz
Merge ../linux-2.6/
Diffstat (limited to 'drivers/mtd/maps/amd76xrom.c')
-rw-r--r--drivers/mtd/maps/amd76xrom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 51e97b0..e8a900a 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -2,7 +2,7 @@
* amd76xrom.c
*
* Normal mappings of chips in physical memory
- * $Id: amd76xrom.c,v 1.19 2004/11/28 09:40:39 dwmw2 Exp $
+ * $Id: amd76xrom.c,v 1.20 2005/03/18 14:04:35 gleixner Exp $
*/
#include <linux/module.h>
@@ -314,7 +314,7 @@ static int __init init_amd76xrom(void)
}
return -ENXIO;
#if 0
- return pci_module_init(&amd76xrom_driver);
+ return pci_register_driver(&amd76xrom_driver);
#endif
}
OpenPOWER on IntegriCloud