diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 18:04:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 18:04:29 -0700 |
| commit | 89661adaaee2f85116b399e642129ccd4dafd195 (patch) | |
| tree | 86a0bea62ef1ebbd454d5daa4deef1534ab5a222 /drivers/video | |
| parent | 6adae5d9e69743aede91b274224751811f7174f1 (diff) | |
| parent | 9890b12a4a65a7b3181dd963421740edf0e14d69 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (59 commits)
PCI: Free resource files in error path of pci_create_sysfs_dev_files()
pci-quirks: disable MSI on RS400-200 and RS480
PCI hotplug: Use menuconfig objects
PCI: ZT5550 CPCI Hotplug driver fix
PCI: rpaphp: Remove semaphores
PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry
PCI: rpaphp: Use pcibios_remove_pci_devices() symmetrically
PCI: rpaphp: Document is_php_dn()
PCI: rpaphp: Document find_php_slot()
PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()
PCI: rpaphp: refactor tail call to rpaphp_register_slot()
PCI: rpaphp: remove rpaphp_set_attention_status()
PCI: rpaphp: remove print_slot_pci_funcs()
PCI: rpaphp: Remove setup_pci_slot()
PCI: rpaphp: remove a call that does nothing but a pointer lookup
PCI: rpaphp: Remove another wrappered function
PCI: rpaphp: Remve another call that is a wrapper
PCI: rpaphp: remove a function that does nothing but wrap debug printks
PCI: rpaphp: Remove un-needed goto
PCI: rpaphp: Fix a memleak; slot->location string was never freed
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aty/radeon_i2c.c | 1 | ||||
| -rw-r--r-- | drivers/video/g364fb.c | 1 | ||||
| -rw-r--r-- | drivers/video/platinumfb.c | 1 | ||||
| -rw-r--r-- | drivers/video/stifb.c | 1 | ||||
| -rw-r--r-- | drivers/video/valkyriefb.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c index 50847992070..7db9de68171 100644 --- a/drivers/video/aty/radeon_i2c.c +++ b/drivers/video/aty/radeon_i2c.c @@ -1,7 +1,6 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/delay.h> -#include <linux/pci.h> #include <linux/fb.h> diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c index ca93a75f299..b7655c05da5 100644 --- a/drivers/video/g364fb.c +++ b/drivers/video/g364fb.c @@ -26,7 +26,6 @@ #include <linux/interrupt.h> #include <linux/fb.h> #include <linux/init.h> -#include <linux/pci.h> #include <asm/io.h> #include <asm/jazz.h> diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c index 23387165582..e64f8b5d005 100644 --- a/drivers/video/platinumfb.c +++ b/drivers/video/platinumfb.c @@ -28,7 +28,6 @@ #include <linux/interrupt.h> #include <linux/fb.h> #include <linux/init.h> -#include <linux/pci.h> #include <linux/nvram.h> #include <asm/io.h> #include <asm/prom.h> diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 69f3b264a22..c97709ecbad 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c @@ -64,7 +64,6 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/ioport.h> -#include <linux/pci.h> #include <asm/grfioctl.h> /* for HP-UX compatibility */ #include <asm/uaccess.h> diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 06fc19a6119..ad66f070acb 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c @@ -51,7 +51,6 @@ #include <linux/fb.h> #include <linux/selection.h> #include <linux/init.h> -#include <linux/pci.h> #include <linux/nvram.h> #include <linux/adb.h> #include <linux/cuda.h> |