]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 24 Nov 2011 08:34:03 +0000 (17:34 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 24 Nov 2011 08:34:03 +0000 (17:34 +0900)
1  2 
arch/arm/mach-shmobile/Makefile

index 971f7038f05a6bcc5879a76269a80c938ef173bb,737bdc631b0dba4d292057bd0393840880b3a2e7..5ee604dcaf57a6345993c824a0b254730e1b01af
@@@ -3,14 -3,13 +3,14 @@@
  #
  
  # Common objects
- obj-y                         := timer.o console.o clock.o pm_runtime.o
+ obj-y                         := timer.o console.o clock.o
  
  # CPU objects
  obj-$(CONFIG_ARCH_SH7367)     += setup-sh7367.o clock-sh7367.o intc-sh7367.o
  obj-$(CONFIG_ARCH_SH7377)     += setup-sh7377.o clock-sh7377.o intc-sh7377.o
  obj-$(CONFIG_ARCH_SH7372)     += setup-sh7372.o clock-sh7372.o intc-sh7372.o
  obj-$(CONFIG_ARCH_SH73A0)     += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
 +obj-$(CONFIG_ARCH_R8A7740)    += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
  
  # SMP objects
  smp-y                         := platsmp.o headsmp.o
@@@ -24,14 -23,12 +24,14 @@@ pfc-$(CONFIG_ARCH_SH7367)  += pfc-sh7367
  pfc-$(CONFIG_ARCH_SH7377)     += pfc-sh7377.o
  pfc-$(CONFIG_ARCH_SH7372)     += pfc-sh7372.o
  pfc-$(CONFIG_ARCH_SH73A0)     += pfc-sh73a0.o
 +pfc-$(CONFIG_ARCH_R8A7740)    += pfc-r8a7740.o
  
  # IRQ objects
  obj-$(CONFIG_ARCH_SH7367)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7377)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7372)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH73A0)     += entry-gic.o
 +obj-$(CONFIG_ARCH_R8A7740)    += entry-intc.o
  
  # PM objects
  obj-$(CONFIG_SUSPEND)         += suspend.o