diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/ppc/platforms/ev64260.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/platforms/ev64260.c')
| -rw-r--r-- | arch/ppc/platforms/ev64260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c index 6444760caa3a..31e8e21e1d5c 100644 --- a/arch/ppc/platforms/ev64260.c +++ b/arch/ppc/platforms/ev64260.c | |||
| @@ -414,7 +414,7 @@ ev64260_fixup_mpsc_pdata(struct platform_device *pdev) | |||
| 414 | return; | 414 | return; |
| 415 | } | 415 | } |
| 416 | 416 | ||
| 417 | static int __init | 417 | static int |
| 418 | ev64260_platform_notify(struct device *dev) | 418 | ev64260_platform_notify(struct device *dev) |
| 419 | { | 419 | { |
| 420 | static struct { | 420 | static struct { |