Pull m68k updates from Geert Uytterhoeven: - more kernel message modernizations and cleanups - Mac and Nubus improvements and cleanups. * tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: nubus: Add MVC and VSC video card definitions nubus: Clean up whitespace nubus: Clean up printk calls nubus: Fix nubus_rewinddir m68k/mac: Clarify IOP message alloc/free confusion m68k/mac: Adopt platform_device_register_simple() m68k/mac: Modernize printing of kernel messages m68k/mac: IOP - Modernize printing of kernel messages
Showing the changes to include/uapi/linux (1 of 5 files). Show all
Unified · Split
| @@ -113,13 +113,15 @@ enum nubus_drhw { · 112 unmodified lines | |||
| 113 | NUBUS_DRHW_SIGMA_CLRMAX = 0x0007, /* Sigma Design ColorMax */ | 113 | NUBUS_DRHW_SIGMA_CLRMAX = 0x0007, /* Sigma Design ColorMax */ |
| 114 | NUBUS_DRHW_APPLE_SE30 = 0x0009, /* Apple SE/30 video */ | 114 | NUBUS_DRHW_APPLE_SE30 = 0x0009, /* Apple SE/30 video */ |
| 115 | NUBUS_DRHW_APPLE_HRVC = 0x0013, /* Mac II High-Res Video Card */ | 115 | NUBUS_DRHW_APPLE_HRVC = 0x0013, /* Mac II High-Res Video Card */ |
| 116 | NUBUS_DRHW_APPLE_MVC = 0x0014, /* Mac II Monochrome Video Card */ | ||
| 116 | NUBUS_DRHW_APPLE_PVC = 0x0017, /* Mac II Portrait Video Card */ | 117 | NUBUS_DRHW_APPLE_PVC = 0x0017, /* Mac II Portrait Video Card */ |
| 117 | NUBUS_DRHW_APPLE_RBV1 = 0x0018, /* IIci RBV video */ | 118 | NUBUS_DRHW_APPLE_RBV1 = 0x0018, /* IIci RBV video */ |
| 118 | NUBUS_DRHW_APPLE_MDC = 0x0019, /* Macintosh Display Card */ | 119 | NUBUS_DRHW_APPLE_MDC = 0x0019, /* Macintosh Display Card */ |
| 120 | NUBUS_DRHW_APPLE_VSC = 0x0020, /* Duo MiniDock ViSC framebuffer */ | ||
| 119 | NUBUS_DRHW_APPLE_SONORA = 0x0022, /* Sonora built-in video */ | 121 | NUBUS_DRHW_APPLE_SONORA = 0x0022, /* Sonora built-in video */ |
| 122 | NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */ | ||
| 120 | NUBUS_DRHW_APPLE_24AC = 0x002b, /* Mac 24AC Video Card */ | 123 | NUBUS_DRHW_APPLE_24AC = 0x002b, /* Mac 24AC Video Card */ |
| 121 | NUBUS_DRHW_APPLE_VALKYRIE = 0x002e, | 124 | NUBUS_DRHW_APPLE_VALKYRIE = 0x002e, |
| 122 | NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */ | ||
| 123 | NUBUS_DRHW_SMAC_GFX = 0x0105, /* SuperMac GFX */ | 125 | NUBUS_DRHW_SMAC_GFX = 0x0105, /* SuperMac GFX */ |
| 124 | NUBUS_DRHW_RASTER_CB264 = 0x013B, /* RasterOps ColorBoard 264 */ | 126 | NUBUS_DRHW_RASTER_CB264 = 0x013B, /* RasterOps ColorBoard 264 */ |
| 125 | NUBUS_DRHW_MICRON_XCEED = 0x0146, /* Micron Exceed color */ | 127 | NUBUS_DRHW_MICRON_XCEED = 0x0146, /* Micron Exceed color */ |