From: H Hartley Sweeten Date: Wed, 31 Oct 2012 23:58:40 +0000 (-0700) Subject: staging: comedi: addi-data: remove addi_amcc_s5933.h X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~719 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf36f012c7ddaff083bb0ef187feddf4d85507a0;p=pandora-kernel.git staging: comedi: addi-data: remove addi_amcc_s5933.h Now that the PCI bus walking has been removed from the addi-data drivers, the only differenced between addi_amcc_s9533.h and the standard comedi amcc_s5933.h is the additional defines for the apci3120 "ADDON RELATED ADDITIONS". Move those defines to hwdrv_apci3120.c. Modify all the addi-data drivers to then include the standard comedi amcc_s5933.h header and delete the duplicate in addi-data. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed