summaryrefslogtreecommitdiff
path: root/include/uapi/linux/fb.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2022-05-03 16:08:48 +1000
committerDave Airlie <airlied@redhat.com>2022-05-03 16:08:48 +1000
commite954d2c94d007afe487044ecfa48f2518643df0e (patch)
tree7903ee4cf7d9387e5bb5285f86a2a82b2eacab44 /include/uapi/linux/fb.h
parent15e2b419a83777ef652bf5f0ea4385ef7711f710 (diff)
parent672c0c5173427e6b3e2a9bbb7be51ceeec78093a (diff)
Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Linux 5.18-rc5 There was a build fix for arm I wanted in drm-next, so backmerge rather then cherry-pick. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/uapi/linux/fb.h')
-rw-r--r--include/uapi/linux/fb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
index 4c14e8be7267..3a49913d006c 100644
--- a/include/uapi/linux/fb.h
+++ b/include/uapi/linux/fb.h
@@ -182,7 +182,7 @@ struct fb_fix_screeninfo {
*
* For pseudocolor: offset and length should be the same for all color
* components. Offset specifies the position of the least significant bit
- * of the pallette index in a pixel value. Length indicates the number
+ * of the palette index in a pixel value. Length indicates the number
* of available palette entries (i.e. # of entries = 1 << length).
*/
struct fb_bitfield {