Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91244
b: refs/heads/master
c: e6816f3
h: refs/heads/master
v: v3
  • Loading branch information
Philipp Zabel authored and Russell King committed Apr 19, 2008
1 parent db47053 commit 0ff05c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 103a1754894eecf488103f7739061e7e767049ad
refs/heads/master: e6816f34e4ee237fc1b54e0357e9ea31462ad411
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-pxa/magician.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <asm/arch/magician.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxafb.h>
#include <asm/arch/i2c.h>
#include <asm/arch/irda.h>
#include <asm/arch/ohci.h>

Expand Down Expand Up @@ -201,6 +202,7 @@ static struct platform_device *devices[] __initdata = {
static void __init magician_init(void)
{
platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_i2c_info(NULL);
pxa_set_ohci_info(&magician_ohci_info);
pxa_set_ficp_info(&magician_ficp_info);
set_pxa_fb_info(&toppoly_info);
Expand Down

0 comments on commit 0ff05c4

Please sign in to comment.