Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / cpia / cpia.h

diff --git a/drivers/media/video/cpia.h b/drivers/staging/cpia/cpia.h
similarity index 100%
rename from drivers/media/video/cpia.h
rename to drivers/staging/cpia/cpia.h