diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /arch/m68knommu/kernel/comempci.c | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'arch/m68knommu/kernel/comempci.c')
| -rw-r--r-- | arch/m68knommu/kernel/comempci.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c index 6ee00effbad2..0a68b5a85f86 100644 --- a/arch/m68knommu/kernel/comempci.c +++ b/arch/m68knommu/kernel/comempci.c | |||
| @@ -375,15 +375,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
| 375 | 375 | ||
| 376 | /*****************************************************************************/ | 376 | /*****************************************************************************/ |
| 377 | 377 | ||
| 378 | void pcibios_update_resource(struct pci_dev *dev, struct resource *root, struct resource *r, int resource) | ||
| 379 | { | ||
| 380 | printk(KERN_WARNING "%s(%d): no support for changing PCI resources...\n", | ||
| 381 | __FILE__, __LINE__); | ||
| 382 | } | ||
| 383 | |||
| 384 | |||
| 385 | /*****************************************************************************/ | ||
| 386 | |||
| 387 | /* | 378 | /* |
| 388 | * Local routines to interrcept the standard I/O and vector handling | 379 | * Local routines to interrcept the standard I/O and vector handling |
| 389 | * code. Don't include this 'till now - initialization code above needs | 380 | * code. Don't include this 'till now - initialization code above needs |