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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf533
/
boards
/
generic_board.c
diff --git
a/arch/blackfin/mach-bf533/boards/generic_board.c
b/arch/blackfin/mach-bf533/boards/generic_board.c
index
310b777
..
82b1f6a
100644
(file)
--- a/
arch/blackfin/mach-bf533/boards/generic_board.c
+++ b/
arch/blackfin/mach-bf533/boards/generic_board.c
@@
-58,10
+58,6
@@
static struct resource smc91x_resources[] = {
.end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, {
.end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, {
- /*
- * denotes the flag pin and is used directly if
- * CONFIG_IRQCHIP_DEMUX_GPIO is defined.
- */
.start = IRQ_PF7,
.end = IRQ_PF7,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
.start = IRQ_PF7,
.end = IRQ_PF7,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@
-88,7
+84,7
@@
static struct platform_device *generic_board_devices[] __initdata = {
static int __init generic_board_init(void)
{
static int __init generic_board_init(void)
{
- printk(KERN_INFO "%s(): registering device resources\n", __
FUNCTION
__);
+ printk(KERN_INFO "%s(): registering device resources\n", __
func
__);
return platform_add_devices(generic_board_devices, ARRAY_SIZE(generic_board_devices));
}
return platform_add_devices(generic_board_devices, ARRAY_SIZE(generic_board_devices));
}