diff --git a/ChangeLog b/ChangeLog index 1ab821d0a..eafce1ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-08-17 Chris Bagwell + * backend/kvs40xx.c: Fix scan() symbol name that + was still conflicting the epjistu and snapscan backends. + 2012-08-16 Rolf Bensch * backend/pixma.[ch], backend/pixma_common.[ch], backend/pixma_imageclass.c, backend/pixma_mp*.c: diff --git a/backend/kvs40xx.c b/backend/kvs40xx.c index 0503cc729..14a22249f 100644 --- a/backend/kvs40xx.c +++ b/backend/kvs40xx.c @@ -592,7 +592,7 @@ sane_start (SANE_Handle handle) return st; } - st = scan (s); + st = ksv40xx_scan (s); if (st) return st;