patch-2.4.19 linux-2.4.19/drivers/ide/ide-cd.h

Next file: linux-2.4.19/drivers/ide/ide-cs.c
Previous file: linux-2.4.19/drivers/ide/ide-cd.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/drivers/ide/ide-cd.h linux-2.4.19/drivers/ide/ide-cd.h
@@ -38,7 +38,9 @@
 /************************************************************************/
 
 #define SECTOR_BITS 		9
+#ifndef SECTOR_SIZE
 #define SECTOR_SIZE		(1 << SECTOR_BITS)
+#endif
 #define SECTORS_PER_FRAME	(CD_FRAMESIZE >> SECTOR_BITS)
 #define SECTOR_BUFFER_SIZE	(CD_FRAMESIZE * 32)
 #define SECTORS_BUFFER		(SECTOR_BUFFER_SIZE >> SECTOR_BITS)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)