[PATCH 0/4] Fix up samsung-laptop.c duplication

From: Michal Marek
Date: Fri Apr 08 2011 - 11:02:24 EST


The samsung-laptop.c driver got merged into drivers/platform/x86/, but a
copy also stayed in drivers/staging and further fixes got applied there.
A parallel build decides randomly which version to link into
samsung-laptop.ko, so this cannot work even if it was intentional. This
series applies the missing patches to drivers/platform/x86/ and deletes
the old version.


Alberto Mardegan (1):
samsung-laptop: Samsung R410P backlight driver

Greg Kroah-Hartman (1):
samsung-laptop: add support for N230 model

Michal Marek (2):
samsung-laptop: set backlight type
staging: samsung-laptop has moved to platform/x86

drivers/platform/x86/samsung-laptop.c | 17 +-
drivers/staging/Makefile | 1 -
drivers/staging/samsung-laptop/Kconfig | 10 -
drivers/staging/samsung-laptop/Makefile | 1 -
drivers/staging/samsung-laptop/TODO | 5 -
drivers/staging/samsung-laptop/samsung-laptop.c | 843 -----------------------
6 files changed, 14 insertions(+), 863 deletions(-)
delete mode 100644 drivers/staging/samsung-laptop/Kconfig
delete mode 100644 drivers/staging/samsung-laptop/Makefile
delete mode 100644 drivers/staging/samsung-laptop/TODO
delete mode 100644 drivers/staging/samsung-laptop/samsung-laptop.c


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/