m68k updates for 4.12
- More kernel message modernizations and cleanups, - Mac and Nubus improvements and cleanups. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZCDNZAAoJEEgEtLw/Ve77Y9MP/iCxkwSnVy1yv8+abAOwboh5 hK+M4S+7t0tcxq1dzneKG9ZiT6Qd9VB5FF0Pxz2sB4U83mTvhCHdvrFDpSPFXCqN Wr5xuRVXQfrIE1S3oxi1f/nsT7FFeEY4SSG8tZL1Cyd4jpVYdUkzUMhTyJ3x03ri 3nDAtBn34r4XYRXj0rNXOgwnCRTrJMG5AO4MnnWJcpBh1azlvU/rJ8MNoN3CpOk8 RWbOoLSYxxLXmdXbackhYhuqXtvN3djqKgPhjDUlH807jP9PRdLQYFLekwpQZfRl 1a6trDNRCUzOnjsinukPvMg50EJnhNzlxSCw9YG/F+pexiDrnu2t+W9GHUcNYQhZ acqteY0f8hOSEmQMRYUPFcI2hkdeH2Z2y3rkWNsNdJV56ukiF8Qbzqz42aX6RD4s GuprHKkV2BdXF3IPdsbXFscThnSNFJCjKyWTDtgsQRAFs2vkSyeAGgzHI9W4jgVB 9ZVDhCFNXmZrWAmAnnAXzfWwTS5dYnjdLpkPHnXM38gQ8zOVj1ZFvXpRD77RH7Fb sSCS6HLywJws3S+W4Jngl9M3JZ9Mk0inYk+7CqTqL3nBRy6eFwcpVv1ExH4Aoeg7 BDDMyBNaE/mtNGErt+s6yLA8PwslKoDzQfbxJdzazJ5CHKL8A4FiUzF9UlQ5Gm1b zsAkSKkeHy8NG/AVJ2J/ =IbyF -----END PGP SIGNATURE----- Merge tag 'm68k-for-v4.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 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
This commit is contained in:
commit
ceb198bb00
5 changed files with 279 additions and 363 deletions
|
|
@ -113,13 +113,15 @@ enum nubus_drhw {
|
|||
NUBUS_DRHW_SIGMA_CLRMAX = 0x0007, /* Sigma Design ColorMax */
|
||||
NUBUS_DRHW_APPLE_SE30 = 0x0009, /* Apple SE/30 video */
|
||||
NUBUS_DRHW_APPLE_HRVC = 0x0013, /* Mac II High-Res Video Card */
|
||||
NUBUS_DRHW_APPLE_MVC = 0x0014, /* Mac II Monochrome Video Card */
|
||||
NUBUS_DRHW_APPLE_PVC = 0x0017, /* Mac II Portrait Video Card */
|
||||
NUBUS_DRHW_APPLE_RBV1 = 0x0018, /* IIci RBV video */
|
||||
NUBUS_DRHW_APPLE_MDC = 0x0019, /* Macintosh Display Card */
|
||||
NUBUS_DRHW_APPLE_VSC = 0x0020, /* Duo MiniDock ViSC framebuffer */
|
||||
NUBUS_DRHW_APPLE_SONORA = 0x0022, /* Sonora built-in video */
|
||||
NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */
|
||||
NUBUS_DRHW_APPLE_24AC = 0x002b, /* Mac 24AC Video Card */
|
||||
NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,
|
||||
NUBUS_DRHW_APPLE_JET = 0x0029, /* Jet framebuffer (DuoDock) */
|
||||
NUBUS_DRHW_SMAC_GFX = 0x0105, /* SuperMac GFX */
|
||||
NUBUS_DRHW_RASTER_CB264 = 0x013B, /* RasterOps ColorBoard 264 */
|
||||
NUBUS_DRHW_MICRON_XCEED = 0x0146, /* Micron Exceed color */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue