Upgrade wayland-ivi-extension
[AGL/meta-agl.git] / meta-agl-bsp / meta-renesas / recipes-kernel / linux / linux / hibernation / 0009-Add-hibernation-store-area.patch
1 From 5509937666792520b755ed61a110c956478d089d Mon Sep 17 00:00:00 2001
2 From: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
3 Date: Thu, 18 May 2017 17:41:19 +0900
4 Subject: [PATCH 09/15] Add hibernation store area
5
6 Signed-off-by: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
7 ---
8  drivers/mtd/Makefile         | 3 ++-
9  drivers/mtd/devices/Makefile | 4 +++-
10  drivers/mtd/devices/phram.c  | 5 ++++-
11  3 files changed, 9 insertions(+), 3 deletions(-)
12
13 diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
14 index 99bb9a1..b48049c 100644
15 --- a/drivers/mtd/Makefile
16 +++ b/drivers/mtd/Makefile
17 @@ -30,7 +30,8 @@ obj-$(CONFIG_MTD_SWAP)                += mtdswap.o
18  nftl-objs              := nftlcore.o nftlmount.o
19  inftl-objs             := inftlcore.o inftlmount.o
20  
21 +obj-$(CONFIG_MTD_SPI_NOR)      += spi-nor/
22 +
23  obj-y          += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
24  
25 -obj-$(CONFIG_MTD_SPI_NOR)      += spi-nor/
26  obj-$(CONFIG_MTD_UBI)          += ubi/
27 diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile
28 index d83bd73..969f0e8 100644
29 --- a/drivers/mtd/devices/Makefile
30 +++ b/drivers/mtd/devices/Makefile
31 @@ -3,8 +3,10 @@
32  #
33  
34  obj-$(CONFIG_MTD_DOCG3)                += docg3.o
35 -obj-$(CONFIG_MTD_SLRAM)                += slram.o
36 +# obj-$(CONFIG_MTD_SLRAM)              += slram.o
37 +# obj-$(CONFIG_MTD_PHRAM)              += phram.o
38  obj-$(CONFIG_MTD_PHRAM)                += phram.o
39 +obj-$(CONFIG_MTD_SLRAM)                += slram.o
40  obj-$(CONFIG_MTD_PMC551)       += pmc551.o
41  obj-$(CONFIG_MTD_MS02NV)       += ms02-nv.o
42  obj-$(CONFIG_MTD_MTDRAM)       += mtdram.o
43 diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
44 index 67823de..f05947f 100644
45 --- a/drivers/mtd/devices/phram.c
46 +++ b/drivers/mtd/devices/phram.c
47 @@ -293,8 +293,11 @@ static void __exit cleanup_phram(void)
48  {
49         unregister_devices();
50  }
51 -
52 +#ifdef __MODULE__
53  module_init(init_phram);
54 +#else
55 +late_initcall(init_phram);
56 +#endif
57  module_exit(cleanup_phram);
58  
59  MODULE_LICENSE("GPL");
60 -- 
61 1.8.3.1
62