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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
bios32.c
diff --git
a/arch/m68k/kernel/bios32.c
b/arch/m68k/kernel/bios32.c
index
738531c
..
af170c2
100644
(file)
--- a/
arch/m68k/kernel/bios32.c
+++ b/
arch/m68k/kernel/bios32.c
@@
-6,7
+6,6
@@
* Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger.
*/
* Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-46,8
+45,6
@@
#define ALIGN(val,align) (((val) + ((align) - 1)) & ~((align) - 1))
#define ALIGN(val,align) (((val) + ((align) - 1)) & ~((align) - 1))
-#define MAX(val1, val2) (((val1) > (val2)) ? val1 : val2)
-
/*
* Offsets relative to the I/O and memory base addresses from where resources
* are allocated.
/*
* Offsets relative to the I/O and memory base addresses from where resources
* are allocated.
@@
-171,7
+168,7
@@
static void __init layout_dev(struct pci_dev *dev)
* Align to multiple of size of minimum base.
*/
* Align to multiple of size of minimum base.
*/
- alignto =
MAX(0x040, size)
;
+ alignto =
max_t(unsigned int, 0x040, size)
;
base = ALIGN(io_base, alignto);
io_base = base + size;
pci_write_config_dword(dev, reg, base | PCI_BASE_ADDRESS_SPACE_IO);
base = ALIGN(io_base, alignto);
io_base = base + size;
pci_write_config_dword(dev, reg, base | PCI_BASE_ADDRESS_SPACE_IO);
@@
-214,7
+211,7
@@
static void __init layout_dev(struct pci_dev *dev)
* Align to multiple of size of minimum base.
*/
* Align to multiple of size of minimum base.
*/
- alignto =
MAX(0x1000, size)
;
+ alignto =
max_t(unsigned int, 0x1000, size)
;
base = ALIGN(mem_base, alignto);
mem_base = base + size;
pci_write_config_dword(dev, reg, base);
base = ALIGN(mem_base, alignto);
mem_base = base + size;
pci_write_config_dword(dev, reg, base);