diff options
| author | Conley Owens <cco3@android.com> | 2011-07-25 17:25:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-25 17:25:13 -0700 |
| commit | c21dcef9fecaa224f153af0c5643fca4933bbc7f (patch) | |
| tree | 43b3b07357d9d257b335801e95338d1b481c57ba /init | |
| parent | 2d3205d2a1404e811cb2c29b57b26137668755ab (diff) | |
| parent | 45e8fc6bfd9221274f48861287ff7af06ee7a199 (diff) | |
| download | system_core-c21dcef9fecaa224f153af0c5643fca4933bbc7f.tar.gz system_core-c21dcef9fecaa224f153af0c5643fca4933bbc7f.tar.bz2 system_core-c21dcef9fecaa224f153af0c5643fca4933bbc7f.zip | |
am 45e8fc6b: am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"
* commit '45e8fc6bfd9221274f48861287ff7af06ee7a199':
Fix build error in init when building with bootchart
Diffstat (limited to 'init')
| -rwxr-xr-x | init/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/init.c b/init/init.c index 1e31cf95..a1d6be10 100755 --- a/init/init.c +++ b/init/init.c @@ -677,6 +677,8 @@ static int bootchart_init_action(int nargs, char **args) } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif |