diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /drivers/pci/hotplug/ibmphp.h | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pci/hotplug/ibmphp.h')
| -rw-r--r-- | drivers/pci/hotplug/ibmphp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h index 5bc039da647f..c22e0284d7b1 100644 --- a/drivers/pci/hotplug/ibmphp.h +++ b/drivers/pci/hotplug/ibmphp.h | |||
| @@ -196,7 +196,7 @@ struct ebda_hpc_bus { | |||
| 196 | 196 | ||
| 197 | 197 | ||
| 198 | /******************************************************************** | 198 | /******************************************************************** |
| 199 | * THREE TYPE OF HOT PLUG CONTROLER * | 199 | * THREE TYPE OF HOT PLUG CONTROLLER * |
| 200 | ********************************************************************/ | 200 | ********************************************************************/ |
| 201 | 201 | ||
| 202 | struct isa_ctlr_access { | 202 | struct isa_ctlr_access { |