diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/zorro | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/proc.c | 2 | ||||
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 1a409c2c320c..7aa2d3de6d37 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c | |||
| @@ -45,7 +45,7 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence) | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | static ssize_t | 47 | static ssize_t |
| 48 | proc_bus_zorro_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) | 48 | proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) |
| 49 | { | 49 | { |
| 50 | struct inode *ino = file->f_dentry->d_inode; | 50 | struct inode *ino = file->f_dentry->d_inode; |
| 51 | struct proc_dir_entry *dp = PDE(ino); | 51 | struct proc_dir_entry *dp = PDE(ino); |
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index ccba227676f2..fcbee748c592 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c | |||
| @@ -77,7 +77,6 @@ int zorro_register_driver(struct zorro_driver *drv) | |||
| 77 | /* initialize common driver fields */ | 77 | /* initialize common driver fields */ |
| 78 | drv->driver.name = drv->name; | 78 | drv->driver.name = drv->name; |
| 79 | drv->driver.bus = &zorro_bus_type; | 79 | drv->driver.bus = &zorro_bus_type; |
| 80 | drv->driver.probe = zorro_device_probe; | ||
| 81 | 80 | ||
| 82 | /* register with core */ | 81 | /* register with core */ |
| 83 | count = driver_register(&drv->driver); | 82 | count = driver_register(&drv->driver); |
| @@ -132,7 +131,8 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv) | |||
| 132 | 131 | ||
| 133 | struct bus_type zorro_bus_type = { | 132 | struct bus_type zorro_bus_type = { |
| 134 | .name = "zorro", | 133 | .name = "zorro", |
| 135 | .match = zorro_bus_match | 134 | .match = zorro_bus_match, |
| 135 | .probe = zorro_device_probe, | ||
| 136 | }; | 136 | }; |
| 137 | 137 | ||
| 138 | 138 | ||