Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / parisc / include / asm / pdc_chassis.h

diff --git a/arch/parisc/include/asm/pdc_chassis.h b/arch/parisc/include/asm/pdc_chassis.h
index ae3e108d22ad649105fd7beb0c06e3d1dfb5603f..d6d82f53d3d0f094e84f7b3c73919ec78e0b9d4c 100644 (file)
--- a/arch/parisc/include/asm/pdc_chassis.h
+++ b/arch/parisc/include/asm/pdc_chassis.h
@@ -365,4 +365,3 @@ void parisc_pdc_chassis_init(void);
                                         PDC_CHASSIS_EOM_SET            )
 
 #endif /* _PARISC_PDC_CHASSIS_H */
-/* vim: set ts=8 */