patch-2.1.48 linux/include/linux/selection.h

• Lines: 49
• Date: Mon Aug 4 14:00:12 1997
• Orig file: v2.1.47/linux/include/linux/selection.h
• Orig date: Mon Jul 7 16:02:27 1997

diff -u --recursive --new-file v2.1.47/linux/include/linux/selection.h linux/include/linux/selection.h
@@ -23,11 +23,11 @@
 #define get_video_num_columns(dummy) video_num_columns
 #define get_video_num_lines(dummy) video_num_lines
 #define get_video_size_row(dummy) video_size_row
+#endif
+
 extern unsigned long video_num_columns;
 extern unsigned long video_num_lines;
 extern unsigned long video_size_row;
-#endif
-
 extern unsigned char video_type;
 extern unsigned long video_mem_base;
 extern unsigned long video_mem_term;
@@ -73,8 +73,6 @@
 
 /* how to access screen memory */
 
-#include <linux/config.h>
-
 #if defined(CONFIG_TGA_CONSOLE)
 
 extern int tga_blitc(unsigned int, unsigned long);
@@ -171,17 +169,25 @@
 
 static inline void scr_writew(unsigned short val, unsigned short * addr)
 {
+#ifdef __powerpc__
+	st_le16(addr, val);
+#else
 	if ((long) addr < 0)
 		*addr = val;
 	else
 		writew(val, (unsigned long) addr);
+#endif /* !__powerpc__ */
 }
 
 static inline unsigned short scr_readw(unsigned short * addr)
 {
+#ifdef __powerpc__
+	return ld_le16(addr);
+#else
 	if ((long) addr < 0)
 		return *addr;
 	return readw((unsigned long) addr);
+#endif /* !__powerpc__ */	
 }
 
 #endif /* CONFIG_TGA_CONSOLE */