diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /arch/powerpc | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/fsl_rio.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 51df7e754698..f9751c8905be 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c | |||
| @@ -102,7 +102,7 @@ static struct of_device_id mpc837x_ids[] = { | |||
| 102 | 102 | ||
| 103 | static int __init mpc837x_declare_of_platform_devices(void) | 103 | static int __init mpc837x_declare_of_platform_devices(void) |
| 104 | { | 104 | { |
| 105 | /* Publish of_device */ | 105 | /* Publish platform_device */ |
| 106 | of_platform_bus_probe(NULL, mpc837x_ids, NULL); | 106 | of_platform_bus_probe(NULL, mpc837x_ids, NULL); |
| 107 | 107 | ||
| 108 | return 0; | 108 | return 0; |
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index e00801c42540..910caa6b5810 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c | |||
| @@ -78,7 +78,7 @@ static struct of_device_id mpc837x_ids[] = { | |||
| 78 | 78 | ||
| 79 | static int __init mpc837x_declare_of_platform_devices(void) | 79 | static int __init mpc837x_declare_of_platform_devices(void) |
| 80 | { | 80 | { |
| 81 | /* Publish of_device */ | 81 | /* Publish platform_device */ |
| 82 | of_platform_bus_probe(NULL, mpc837x_ids, NULL); | 82 | of_platform_bus_probe(NULL, mpc837x_ids, NULL); |
| 83 | 83 | ||
| 84 | return 0; | 84 | return 0; |
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 8bd86530ee25..6425abe5b7db 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c | |||
| @@ -1332,7 +1332,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr) | |||
| 1332 | 1332 | ||
| 1333 | /** | 1333 | /** |
| 1334 | * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface | 1334 | * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface |
| 1335 | * @dev: of_device pointer | 1335 | * @dev: platform_device pointer |
| 1336 | * | 1336 | * |
| 1337 | * Initializes MPC85xx RapidIO hardware interface, configures | 1337 | * Initializes MPC85xx RapidIO hardware interface, configures |
| 1338 | * master port with system-specific info, and registers the | 1338 | * master port with system-specific info, and registers the |