diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 00:38:26 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 00:38:26 -0600 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /arch/microblaze/include/asm/of_device.h | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
| download | linux-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.gz linux-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.bz2 linux-b1e50ebcf24668e57f058deb48b0704b5391ed0f.zip | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'arch/microblaze/include/asm/of_device.h')
| -rw-r--r-- | arch/microblaze/include/asm/of_device.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h index ba917cfaefe6..73cb98040982 100644 --- a/arch/microblaze/include/asm/of_device.h +++ b/arch/microblaze/include/asm/of_device.h @@ -21,9 +21,8 @@ * probed using OF properties. */ struct of_device { - struct device_node *node; /* to be obsoleted */ - u64 dma_mask; /* DMA mask */ struct device dev; /* Generic device interface */ + struct pdev_archdata archdata; }; extern ssize_t of_device_get_modalias(struct of_device *ofdev, |