diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /arch/mips/rb532/devices.c | |
| parent | drivers/dma: Correct use after free (diff) | |
| parent | ioat2,3: put channel hardware in known state at init (diff) | |
| download | linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.xz linux-f80ca163d65903276bec7045a484a79c0897eb2d.zip | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'arch/mips/rb532/devices.c')
| -rw-r--r-- | arch/mips/rb532/devices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 9f40e1ff9b4f..041fc1afc3f4 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c @@ -110,7 +110,6 @@ static struct korina_device korina_dev0_data = { static struct platform_device korina_dev0 = { .id = -1, .name = "korina", - .dev.driver_data = &korina_dev0_data, .resource = korina_dev0_res, .num_resources = ARRAY_SIZE(korina_dev0_res), }; @@ -332,6 +331,8 @@ static int __init plat_setup_devices(void) /* set the uart clock to the current cpu frequency */ rb532_uart_res[0].uartclk = idt_cpu_freq; + dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data); + return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs)); } |