diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/video/riva | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index b7bd6bb2c77c..3e9308f0f165 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
| @@ -2073,8 +2073,6 @@ static void __exit rivafb_remove(struct pci_dev *pd) | |||
| 2073 | struct riva_par *par = info->par; | 2073 | struct riva_par *par = info->par; |
| 2074 | 2074 | ||
| 2075 | NVTRACE_ENTER(); | 2075 | NVTRACE_ENTER(); |
| 2076 | if (!info) | ||
| 2077 | return; | ||
| 2078 | 2076 | ||
| 2079 | #ifdef CONFIG_FB_RIVA_I2C | 2077 | #ifdef CONFIG_FB_RIVA_I2C |
| 2080 | riva_delete_i2c_busses(par); | 2078 | riva_delete_i2c_busses(par); |