diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/Kconfig | 18 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 970f70d498f4..b46a72d782d6 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -943,6 +943,15 @@ config RAW_DRIVER | |||
943 | Applications should simply open the device (eg /dev/hda1) | 943 | Applications should simply open the device (eg /dev/hda1) |
944 | with the O_DIRECT flag. | 944 | with the O_DIRECT flag. |
945 | 945 | ||
946 | config MAX_RAW_DEVS | ||
947 | int "Maximum number of RAW devices to support (1-8192)" | ||
948 | depends on RAW_DRIVER | ||
949 | default "256" | ||
950 | help | ||
951 | The maximum number of RAW devices that are supported. | ||
952 | Default is 256. Increase this number in case you need lots of | ||
953 | raw devices. | ||
954 | |||
946 | config HPET | 955 | config HPET |
947 | bool "HPET - High Precision Event Timer" if (X86 || IA64) | 956 | bool "HPET - High Precision Event Timer" if (X86 || IA64) |
948 | default n | 957 | default n |
@@ -974,15 +983,6 @@ config HPET_MMAP | |||
974 | exposed to the user. If this applies to your hardware, | 983 | exposed to the user. If this applies to your hardware, |
975 | say N here. | 984 | say N here. |
976 | 985 | ||
977 | config MAX_RAW_DEVS | ||
978 | int "Maximum number of RAW devices to support (1-8192)" | ||
979 | depends on RAW_DRIVER | ||
980 | default "256" | ||
981 | help | ||
982 | The maximum number of RAW devices that are supported. | ||
983 | Default is 256. Increase this number in case you need lots of | ||
984 | raw devices. | ||
985 | |||
986 | config HANGCHECK_TIMER | 986 | config HANGCHECK_TIMER |
987 | tristate "Hangcheck timer" | 987 | tristate "Hangcheck timer" |
988 | depends on X86 || IA64 || PPC64 || ARCH_S390 | 988 | depends on X86 || IA64 || PPC64 || ARCH_S390 |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 6b302a930e5f..1f56b4cf0f58 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -2986,7 +2986,7 @@ static void send_panic_events(char *str) | |||
2986 | msg.cmd = 2; /* Platform event command. */ | 2986 | msg.cmd = 2; /* Platform event command. */ |
2987 | msg.data = data; | 2987 | msg.data = data; |
2988 | msg.data_len = 8; | 2988 | msg.data_len = 8; |
2989 | data[0] = 0x21; /* Kernel generator ID, IPMI table 5-4 */ | 2989 | data[0] = 0x41; /* Kernel generator ID, IPMI table 5-4 */ |
2990 | data[1] = 0x03; /* This is for IPMI 1.0. */ | 2990 | data[1] = 0x03; /* This is for IPMI 1.0. */ |
2991 | data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */ | 2991 | data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */ |
2992 | data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */ | 2992 | data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */ |