Merge branch 'master'

[mv-sheeva.git] / include / asm-parisc / parisc-device.h

diff --git a/include/asm-parisc/parisc-device.h b/include/asm-parisc/parisc-device.h
index cbde8b41c84b10482670d7c7d7fa78231e582cbc..1d247e32a6088e180284e5fb7be23ed8ce83f464 100644 (file)
--- a/include/asm-parisc/parisc-device.h
+++ b/include/asm-parisc/parisc-device.h
@@ -1,7 +1,7 @@
 #include <linux/device.h>
 
 struct parisc_device {
-       unsigned long   hpa;            /* Hard Physical Address */
+       struct resource hpa;            /* Hard Physical Address */
        struct parisc_device_id id;
        struct parisc_driver *driver;   /* Driver for this device */
        char            name[80];       /* The hardware description */