]>
Commit | Line | Data |
---|---|---|
0fca2e6c | 1 | # This is a BitKeeper generated patch for the following project: |
2 | # Project Name: Linux kernel tree | |
3 | # This patch format is intended for GNU patch command version 2.5 or higher. | |
4 | # This patch includes the following deltas: | |
5 | # ChangeSet 1.1344 -> 1.1345 | |
6 | # include/linux/toshiba.h 1.3 -> 1.4 | |
7 | # drivers/char/toshiba.c 1.11 -> 1.12 | |
8 | # | |
9 | # The following is the BitKeeper ChangeSet Log | |
10 | # -------------------------------------------- | |
11 | # 03/10/10 noah@caltech.edu 1.1345 | |
12 | # Remove the prototypes for tosh_get_info from include/linux/toshiba.h and | |
13 | # make the function's definition in drivers/char/toshiba.c static. This | |
14 | # function is specific to toshiba.c, so no other file needs the prototype. | |
15 | # | |
16 | # This allows drivers/char/toshiba.c to compile with CONFIG_PROC_FS=n and | |
17 | # allows one to link more than one driver that includes toshiba.h into the | |
18 | # kernel at the same time without a multiple declaration; for example, both | |
19 | # drivers/char/toshiba.c and drivers/video/neofb.c. | |
20 | # -------------------------------------------- | |
21 | # | |
22 | diff -Nru a/drivers/char/toshiba.c b/drivers/char/toshiba.c | |
23 | --- a/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003 | |
24 | +++ b/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003 | |
25 | @@ -292,7 +292,7 @@ | |
26 | * Print the information for /proc/toshiba | |
27 | */ | |
28 | #ifdef CONFIG_PROC_FS | |
29 | -int tosh_get_info(char *buffer, char **start, off_t fpos, int length) | |
30 | +static int tosh_get_info(char *buffer, char **start, off_t fpos, int length) | |
31 | { | |
32 | char *temp; | |
33 | int key; | |
34 | diff -Nru a/include/linux/toshiba.h b/include/linux/toshiba.h | |
35 | --- a/include/linux/toshiba.h Fri Oct 10 18:50:17 2003 | |
36 | +++ b/include/linux/toshiba.h Fri Oct 10 18:50:17 2003 | |
37 | @@ -33,13 +33,4 @@ | |
38 | unsigned int edi __attribute__ ((packed)); | |
39 | } SMMRegisters; | |
40 | ||
41 | -#ifdef CONFIG_PROC_FS | |
42 | -static int tosh_get_info(char *, char **, off_t, int); | |
43 | -#else /* !CONFIG_PROC_FS */ | |
44 | -inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght) | |
45 | -{ | |
46 | - return 0; | |
47 | -} | |
48 | -#endif /* CONFIG_PROC_FS */ | |
49 | - | |
50 | #endif |