hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/arch/parisc/include/asm/hardware.h
....@@ -10,12 +10,12 @@
1010 #define SVERSION_ANY_ID PA_SVERSION_ANY_ID
1111
1212 struct hp_hardware {
13
- unsigned short hw_type:5; /* HPHW_xxx */
14
- unsigned short hversion;
15
- unsigned long sversion:28;
16
- unsigned short opt;
17
- const char name[80]; /* The hardware description */
18
-};
13
+ unsigned int hw_type:8; /* HPHW_xxx */
14
+ unsigned int hversion:12;
15
+ unsigned int sversion:12;
16
+ unsigned char opt;
17
+ unsigned char name[59]; /* The hardware description */
18
+} __packed;
1919
2020 struct parisc_device;
2121
....@@ -120,7 +120,7 @@
120120 extern void init_parisc_bus(void);
121121 extern struct device *hwpath_to_device(struct hardware_path *modpath);
122122 extern void device_to_hwpath(struct device *dev, struct hardware_path *path);
123
-
123
+extern int machine_has_merced_bus(void);
124124
125125 /* inventory.c: */
126126 extern void do_memory_inventory(void);