diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/video/p9100.c | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/video/p9100.c')
| -rw-r--r-- | drivers/video/p9100.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 18bcda23d2cf..b251e754e16c 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
| @@ -140,7 +140,6 @@ struct p9100_par { | |||
| 140 | unsigned long fbsize; | 140 | unsigned long fbsize; |
| 141 | 141 | ||
| 142 | struct sbus_dev *sdev; | 142 | struct sbus_dev *sdev; |
| 143 | struct list_head list; | ||
| 144 | }; | 143 | }; |
| 145 | 144 | ||
| 146 | /** | 145 | /** |