Merge 2.6.38-rc6 into tty-next
This was to resolve a merge issue with drivers/char/Makefile and drivers/tty/serial/68328serial.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -43,4 +43,6 @@ static inline u64 picl_value(unsigned int nmi_hz)
|
||||
|
||||
extern u64 pcr_enable;
|
||||
|
||||
extern int pcr_arch_init(void);
|
||||
|
||||
#endif /* __PCR_H */
|
||||
|
Reference in New Issue
Block a user