diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 19:17:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 19:17:50 -0500 |
| commit | 49569646b2413ee1a4fb7c4537fca058ac22292e (patch) | |
| tree | 41b8bc72975610295c2e4cf9318478272c667c75 /lib | |
| parent | 5f738967e89584f99c6a11c6bf09b16c50b6a03e (diff) | |
| parent | 6ae141718e3f9c7e2c620e999c86612a7f415bb1 (diff) | |
Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman:
"Here are the remaining __dev* removal patches against the 3.8-rc2
tree. All of these patches were previously sent to the subsystem
maintainers, most of them were picked up and pushed to you, but there
were a number that fell through the cracks, and new drivers were added
during the merge window, so this series cleans up the rest of the
instances of these markings.
Third time's the charm...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.
* tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits)
misc: remove __dev* attributes.
include: remove __dev* attributes.
Documentation: remove __dev* attributes.
Drivers: misc: remove __dev* attributes.
Drivers: block: remove __dev* attributes.
Drivers: bcma: remove __dev* attributes.
Drivers: char: remove __dev* attributes.
Drivers: clocksource: remove __dev* attributes.
Drivers: ssb: remove __dev* attributes.
Drivers: dma: remove __dev* attributes.
Drivers: gpu: remove __dev* attributes.
Drivers: infinband: remove __dev* attributes.
Drivers: memory: remove __dev* attributes.
Drivers: mmc: remove __dev* attributes.
Drivers: iommu: remove __dev* attributes.
Drivers: power: remove __dev* attributes.
Drivers: message: remove __dev* attributes.
Drivers: macintosh: remove __dev* attributes.
Drivers: mfd: remove __dev* attributes.
pstore: remove __dev* attributes.
...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 3a353091a903..67604e599384 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -134,7 +134,7 @@ config DEBUG_SECTION_MISMATCH | |||
| 134 | any use of code/data previously in these sections would | 134 | any use of code/data previously in these sections would |
| 135 | most likely result in an oops. | 135 | most likely result in an oops. |
| 136 | In the code, functions and variables are annotated with | 136 | In the code, functions and variables are annotated with |
| 137 | __init, __devinit, etc. (see the full list in include/linux/init.h), | 137 | __init, __cpuinit, etc. (see the full list in include/linux/init.h), |
| 138 | which results in the code/data being placed in specific sections. | 138 | which results in the code/data being placed in specific sections. |
| 139 | The section mismatch analysis is always performed after a full | 139 | The section mismatch analysis is always performed after a full |
| 140 | kernel build, and enabling this option causes the following | 140 | kernel build, and enabling this option causes the following |