diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 23:56:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 23:56:24 -0500 |
| commit | 77eebf346dfe87587ee8a54c76349a996e80c24f (patch) | |
| tree | d8b7685cbc7dbc993ec39d3028e6f0246924bf40 /arch/ia64/pci/pci.c | |
| parent | 2641dfd981e4a3eebf387f21cf10685af06e1641 (diff) | |
| parent | d2b176ed878d4d5fcc0bd35656dfd373f3702af9 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0b30ca006286..9ba32b2d96d0 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -579,7 +579,7 @@ pcibios_align_resource (void *data, struct resource *res, | |||
| 579 | char * __init | 579 | char * __init |
| 580 | pcibios_setup (char *str) | 580 | pcibios_setup (char *str) |
| 581 | { | 581 | { |
| 582 | return NULL; | 582 | return str; |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | int | 585 | int |