Revision 004731b2c7c658d36bee167cb1e1a399c2cbccc9 authored by OGAWA Hirofumi on 08 January 2010, 22:43:11 UTC, committed by Linus Torvalds on 11 January 2010, 17:34:07 UTC
commit abd6633c67925f90775bb74755f9c547e30f1f20 ("pnp: add a shutdown method to pnp drivers") adds shutdown method to bus driver blindly. With it, driver->shutdown is no longer valid. Use pnp_driver->shutdown instead. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14889 Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Reported-by: Malte Schröder <maltesch@gmx.de> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: David Hardeman <david@hardeman.nu> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Cc: <stable@kernel.org> [2.6.32.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 7f53a09
macmodes.h
/*
* linux/drivers/video/macmodes.h -- Standard MacOS video modes
*
* Copyright (C) 1998 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive for
* more details.
*/
#ifndef _VIDEO_MACMODES_H
#define _VIDEO_MACMODES_H
/*
* Video mode values.
* These are supposed to be the same as the values that Apple uses in
* MacOS.
*/
#define VMODE_NVRAM 0
#define VMODE_512_384_60I 1 /* 512x384, 60Hz interlaced (NTSC) */
#define VMODE_512_384_60 2 /* 512x384, 60Hz */
#define VMODE_640_480_50I 3 /* 640x480, 50Hz interlaced (PAL) */
#define VMODE_640_480_60I 4 /* 640x480, 60Hz interlaced (NTSC) */
#define VMODE_640_480_60 5 /* 640x480, 60Hz (VGA) */
#define VMODE_640_480_67 6 /* 640x480, 67Hz */
#define VMODE_640_870_75P 7 /* 640x870, 75Hz (portrait) */
#define VMODE_768_576_50I 8 /* 768x576, 50Hz (PAL full frame) */
#define VMODE_800_600_56 9 /* 800x600, 56Hz */
#define VMODE_800_600_60 10 /* 800x600, 60Hz */
#define VMODE_800_600_72 11 /* 800x600, 72Hz */
#define VMODE_800_600_75 12 /* 800x600, 75Hz */
#define VMODE_832_624_75 13 /* 832x624, 75Hz */
#define VMODE_1024_768_60 14 /* 1024x768, 60Hz */
#define VMODE_1024_768_70 15 /* 1024x768, 70Hz (or 72Hz?) */
#define VMODE_1024_768_75V 16 /* 1024x768, 75Hz (VESA) */
#define VMODE_1024_768_75 17 /* 1024x768, 75Hz */
#define VMODE_1152_870_75 18 /* 1152x870, 75Hz */
#define VMODE_1280_960_75 19 /* 1280x960, 75Hz */
#define VMODE_1280_1024_75 20 /* 1280x1024, 75Hz */
#define VMODE_1152_768_60 21 /* 1152x768, 60Hz Titanium PowerBook */
#define VMODE_1600_1024_60 22 /* 1600x1024, 60Hz 22" Cinema Display */
#define VMODE_MAX 22
#define VMODE_CHOOSE 99
#define CMODE_NVRAM -1
#define CMODE_CHOOSE -2
#define CMODE_8 0 /* 8 bits/pixel */
#define CMODE_16 1 /* 16 (actually 15) bits/pixel */
#define CMODE_32 2 /* 32 (actually 24) bits/pixel */
extern int mac_vmode_to_var(int vmode, int cmode,
struct fb_var_screeninfo *var);
extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
int *cmode);
extern int mac_map_monitor_sense(int sense);
extern int mac_find_mode(struct fb_var_screeninfo *var,
struct fb_info *info,
const char *mode_option,
unsigned int default_bpp);
/*
* Addresses in NVRAM where video mode and pixel size are stored.
*/
#define NV_VMODE 0x140f
#define NV_CMODE 0x1410
#endif /* _VIDEO_MACMODES_H */
Computing file changes ...