diff --git a/[refs] b/[refs] index a392592fc110..fc9107beda12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17304245f0db0ac69b795c411407808f3f2796d +refs/heads/master: 736f93236ce786d1bcf09ad4dcb38a360d35ea1b diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c index f8241e832aa3..76f4a0125338 100644 --- a/trunk/init/initramfs.c +++ b/trunk/init/initramfs.c @@ -390,7 +390,6 @@ static int __init write_buffer(char *buf, unsigned len) return len - count; } -#if defined CONFIG_RD_GZIP || defined CONFIG_RD_BZIP2 || defined CONFIG_RD_LZMA static int __init flush_buffer(void *bufv, unsigned len) { char *buf = (char *) bufv; @@ -413,7 +412,6 @@ static int __init flush_buffer(void *bufv, unsigned len) } return origLen; } -#endif static unsigned my_inptr; /* index of next byte to be processed in inbuf */