git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
mips
/
pmc-sierra
/
yosemite
/
ht.c
diff --git
a/arch/mips/pmc-sierra/yosemite/ht.c
b/arch/mips/pmc-sierra/yosemite/ht.c
index
1f7c999
..
54b65a8
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/ht.c
+++ b/
arch/mips/pmc-sierra/yosemite/ht.c
@@
-23,6
+23,7
@@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
@@
-382,12
+383,12
@@
void pcibios_update_resource(struct pci_dev *dev, struct resource *root,
void pcibios_align_resource(void *data, struct resource *res,
void pcibios_align_resource(void *data, struct resource *res,
-
resource_size_t size, resource_size_t
align)
+
unsigned long size, unsigned long
align)
{
struct pci_dev *dev = data;
if (res->flags & IORESOURCE_IO) {
{
struct pci_dev *dev = data;
if (res->flags & IORESOURCE_IO) {
-
resource_size_t
start = res->start;
+
unsigned long
start = res->start;
/* We need to avoid collisions with `mirrored' VGA ports
and other strange ISA hardware, so we always want the
/* We need to avoid collisions with `mirrored' VGA ports
and other strange ISA hardware, so we always want the