git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
pci.c
diff --git
a/arch/parisc/kernel/pci.c
b/arch/parisc/kernel/pci.c
index
d3b8fc5
..
563df00
100644
(file)
--- a/
arch/parisc/kernel/pci.c
+++ b/
arch/parisc/kernel/pci.c
@@
-200,8
+200,8
@@
static void
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
if (!r->parent) {
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
if (!r->parent) {
- printk(KERN_EMERG "PCI: resource not parented! [%
lx-%lx
]\n",
-
r->start,
r->end);
+ printk(KERN_EMERG "PCI: resource not parented! [%
p-%p
]\n",
+
(void*) r->start, (void*)
r->end);
r->parent = hba_res;
/* reverse link is harder *sigh* */
r->parent = hba_res;
/* reverse link is harder *sigh* */
@@
-290,7
+290,7
@@
EXPORT_SYMBOL(pcibios_bus_to_resource);
void pcibios_align_resource(void *data, struct resource *res,
resource_size_t size, resource_size_t alignment)
{
void pcibios_align_resource(void *data, struct resource *res,
resource_size_t size, resource_size_t alignment)
{
-
unsigned long
mask, align;
+
resource_size_t
mask, align;
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
pci_name(((struct pci_dev *) data)),
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
pci_name(((struct pci_dev *) data)),