[PATCH] andy-tracking merge breakage

[Andy Green]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Somebody in the thread at some point said:

| Fix assorted merge breakage in andy-tracking. With this patch,
| 0b519f14e15365213924505e2e3019c1ff159aa9 builds for GTA02 and it
| even boots ! ;-)

| -	s3c2410_pm_init();
| +	s3c_pm_init();

Thanks for cleaning it... we're living even beyond the edge at the
moment taking in changes from Ben Dooks that aren't complete for 6410
suspend / resume (which is getting close to working).

I put the first stanza of this on stable-tracking and the second on
pending-tracking where the merge conflict got missed.

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkk3pNgACgkQOjLpvpq7dMoTtACeOqbtXowQRoQraoZfXnA+Hs3g
hp4An0O99bRrYTfNrQGl86jAuu0npU0b
=Cl1J
-----END PGP SIGNATURE-----